---

yaml --- r: 299739 b: refs/heads/master c: ed8cd3b h: refs/heads/master i: 299737: 2bdad8d 299735: c5e4002 v: v3
git-mirror · Apr 23, 2012 · 4b58a10 · 4b58a10
1 parent 9b80c14
commit 4b58a10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e95c8438ea1c56c254f0607c8fb6bca7f463c744
+refs/heads/master: ed8cd3b2cd61004cab85380c52b1817aca1ca49b
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1404,7 +1404,8 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
 	struct drm_i915_gem_exec_object2 *exec2_list = NULL;
 	int ret;
 
-	if (args->buffer_count < 1) {
+	if (args->buffer_count < 1 ||
+	    args->buffer_count > UINT_MAX / sizeof(*exec2_list)) {
 		DRM_DEBUG("execbuf2 with %d buffers\n", args->buffer_count);
 		return -EINVAL;
 	}