mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] drm/i915: bounds check execbuffer relocations
@ 2013-03-11 19:27 Kees Cook
  2013-03-11 20:52 ` Chris Wilson
  0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2013-03-11 19:27 UTC (permalink / raw)
  To: linux-kernel; +Cc: Daniel Vetter, David Airlie, dri-devel

It is possible to wrap the counter used to allocate the buffer for
relocation copies. This could lead to heap writing overflows.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reported-by: Pinkie Pie
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 752e399..62eaa99 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -585,7 +585,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
 	struct drm_i915_gem_object *obj;
 	bool need_relocs;
 	int *reloc_offset;
-	int i, total, ret;
+	int ret;
+	unsigned int i, total;
 	int count = args->buffer_count;
 
 	/* We may process another execbuffer during the unlock... */
@@ -600,8 +601,13 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
 	mutex_unlock(&dev->struct_mutex);
 
 	total = 0;
-	for (i = 0; i < count; i++)
+	for (i = 0; i < count; i++) {
+		if (exec[i].relocation_count > UINT_MAX - total) {
+			mutex_lock(&dev->struct_mutex);
+			return -ENOMEM;
+		}
 		total += exec[i].relocation_count;
+	}
 
 	reloc_offset = drm_malloc_ab(count, sizeof(*reloc_offset));
 	reloc = drm_malloc_ab(total, sizeof(*reloc));
-- 
1.7.9.5


-- 
Kees Cook
Chrome OS Security

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] drm/i915: bounds check execbuffer relocations
  2013-03-11 19:27 [PATCH] drm/i915: bounds check execbuffer relocations Kees Cook
@ 2013-03-11 20:52 ` Chris Wilson
  2013-03-11 21:08   ` Kees Cook
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2013-03-11 20:52 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-kernel, Daniel Vetter, David Airlie, dri-devel

On Mon, Mar 11, 2013 at 12:27:16PM -0700, Kees Cook wrote:
> It is possible to wrap the counter used to allocate the buffer for
> relocation copies. This could lead to heap writing overflows.

Seems a sensible check, just in the wrong location. You need to do the
checking upfront in validate_exec_list() so that the error condition is
always hit and that the limits are applied consistently to all
execbuffers.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] drm/i915: bounds check execbuffer relocations
  2013-03-11 20:52 ` Chris Wilson
@ 2013-03-11 21:08   ` Kees Cook
  0 siblings, 0 replies; 3+ messages in thread
From: Kees Cook @ 2013-03-11 21:08 UTC (permalink / raw)
  To: Chris Wilson, Kees Cook, LKML, Daniel Vetter, David Airlie, dri-devel

On Mon, Mar 11, 2013 at 1:52 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Mon, Mar 11, 2013 at 12:27:16PM -0700, Kees Cook wrote:
>> It is possible to wrap the counter used to allocate the buffer for
>> relocation copies. This could lead to heap writing overflows.
>
> Seems a sensible check, just in the wrong location. You need to do the
> checking upfront in validate_exec_list() so that the error condition is
> always hit and that the limits are applied consistently to all
> execbuffers.

I opted for it here because it kept it out of the fast path which
didn't need this check (it uses a list rather than an array). I will
move it to validate_exec_list().

Thanks!

-Kees

--
Kees Cook
Chrome OS Security

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-11 21:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-11 19:27 [PATCH] drm/i915: bounds check execbuffer relocations Kees Cook
2013-03-11 20:52 ` Chris Wilson
2013-03-11 21:08   ` Kees Cook

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®