summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-05-12 22:00:51 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-19 10:54:50 -0700
commitb58f2e1650eafddfdfcff2f4831bf2896f8c9bf6 (patch)
tree5c68ea8972f59e519f0de57aa60780e34465a412 /drivers
parent85e3025845566a5295bf91c514efb3fd640c1a56 (diff)
downloadlinux-3.10-b58f2e1650eafddfdfcff2f4831bf2896f8c9bf6.tar.gz
linux-3.10-b58f2e1650eafddfdfcff2f4831bf2896f8c9bf6.tar.bz2
linux-3.10-b58f2e1650eafddfdfcff2f4831bf2896f8c9bf6.zip
drm/radeon: check incoming cliprects pointer
commit fefaedcfb82d2e57c2320acf60604ab03b750cc0 upstream. The "boxes" parameter points into userspace memory. It should be verified like any other operation against user memory. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/r300_cmdbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 1fe98b421c9..9aa02becf5e 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -74,7 +74,7 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
OUT_RING(CP_PACKET0(R300_RE_CLIPRECT_TL_0, nr * 2 - 1));
for (i = 0; i < nr; ++i) {
- if (DRM_COPY_FROM_USER_UNCHECKED
+ if (DRM_COPY_FROM_USER
(&box, &cmdbuf->boxes[n + i], sizeof(box))) {
DRM_ERROR("copy cliprect faulted\n");
return -EFAULT;