From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: add sanity check for partial view creation
Date: Fri, 18 Mar 2016 15:51:22 +0000 [thread overview]
Message-ID: <1458316282-25229-1-git-send-email-matthew.auld@intel.com> (raw)
Upon creating a partial view we should check that the offset + size is
valid relative to the size of the gem object.
v2:
(Tvrtko Ursulin)
- Don't use pages->nents to determine the page count
v3:
(Chris Wilson)
- Handle potential overflow
v4:
(Chris Wilson)
- Idiomatically handle overflow
- Less idiotic placement
- Treat as programmer error
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index fb0f963..593eb15 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3356,6 +3356,14 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj,
if (WARN_ON(!view))
return ERR_PTR(-EINVAL);
+ if (view->type == I915_GGTT_VIEW_PARTIAL) {
+ unsigned int page_count = obj->base.size >> PAGE_SHIFT;
+ if (WARN_ON(view->params.partial.offset > page_count ||
+ view->params.partial.size > page_count -
+ view->params.partial.offset))
+ return ERR_PTR(-EINVAL);
+ }
+
vma = i915_gem_obj_to_ggtt_view(obj, view);
if (IS_ERR(vma))
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-03-18 15:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 15:51 Matthew Auld [this message]
2016-03-21 10:47 ` ✗ Fi.CI.BAT: warning for drm/i915: add sanity check for partial view creation (rev4) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-03-04 10:11 [PATCH] drm/i915: add sanity check for partial view creation Matthew Auld
2016-03-04 10:53 ` Chris Wilson
2016-03-09 18:31 ` Matthew Auld
2016-03-02 14:33 Matthew Auld
2016-03-02 14:42 ` Chris Wilson
2016-03-03 11:27 ` Auld, Matthew
2016-03-03 11:45 ` Chris Wilson
2016-02-29 17:11 Matthew Auld
2016-02-29 17:57 ` Ville Syrjälä
2016-03-02 13:37 ` Joonas Lahtinen
2016-03-02 13:29 ` Joonas Lahtinen
2016-03-02 13:35 ` Chris Wilson
2016-03-02 13:33 ` Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458316282-25229-1-git-send-email-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.