Skip to contentSkip to conversation

drm/i915: bounds check execbuffer relocations

PATCH Superseded Kees Cook 2 participants 3 messages Mar 11, 2013

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 drm/i915: bounds check execbuffer relocations

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

Reported-by Pinkie Pie
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +8 -2
index 752e399..62eaa99 100644
@@ -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));
Signature · 6 lines
1.7.9.5


-- 
Kees Cook
Chrome OS Security
#1 lore raw
Quoted 2 lines · Kees Cook

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

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
author
#2 lore raw
Quoted 8 lines · Chris Wilson
Quoted 2 lines · Kees Cook

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