From d22116e12e3905a931d1d283def8848e43863ef5 Mon Sep 17 00:00:00 2001
From: Xi Wang <xi.wang@gmail.com>
Date: Mon, 23 Apr 2012 04:06:42 -0400
Subject: [PATCH] --- yaml --- r: 299740 b: refs/heads/master c:
 44afb3a04391a74309d16180d1e4f8386fdfa745 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0062297cb40a..00b463c67873 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed8cd3b2cd61004cab85380c52b1817aca1ca49b
+refs/heads/master: 44afb3a04391a74309d16180d1e4f8386fdfa745
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 7c50e58175c0..de431942ded4 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1133,6 +1133,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 			return -EINVAL;
 		}
 
+		if (args->num_cliprects > UINT_MAX / sizeof(*cliprects)) {
+			DRM_DEBUG("execbuf with %u cliprects\n",
+				  args->num_cliprects);
+			return -EINVAL;
+		}
 		cliprects = kmalloc(args->num_cliprects * sizeof(*cliprects),
 				    GFP_KERNEL);
 		if (cliprects == NULL) {