mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 8f2f90a48393e092ca95f2a6e112baada0db0a3c Mon Sep 17 00:00:00 2001
|
|
From: Xi Wang <xi.wang@gmail.com>
|
|
Date: Mon, 23 Apr 2012 04:06:41 -0400
|
|
Subject: [PATCH 108/165] drm/i915: fix integer overflow in
|
|
i915_gem_execbuffer2()
|
|
|
|
commit ed8cd3b2cd61004cab85380c52b1817aca1ca49b upstream.
|
|
|
|
On 32-bit systems, a large args->buffer_count from userspace via ioctl
|
|
may overflow the allocation size, leading to out-of-bounds access.
|
|
|
|
This vulnerability was introduced in commit 8408c282 ("drm/i915:
|
|
First try a normal large kmalloc for the temporary exec buffers").
|
|
|
|
Signed-off-by: Xi Wang <xi.wang@gmail.com>
|
|
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
|
|
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
[bwh: Backported to 3.2: adjust context]
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++-
|
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
index ed00f29..5b6fe31 100644
|
|
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
|
|
@@ -1322,7 +1322,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_ERROR("execbuf2 with %d buffers\n", args->buffer_count);
|
|
return -EINVAL;
|
|
}
|
|
--
|
|
1.7.7.6
|
|
|