From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130603221201.503398706@goodmis.org> Date: Mon, 03 Jun 2013 18:11:10 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Dave Airlie Subject: [54/65] drm/radeon: check incoming cliprects pointer References: <20130603221016.243553628@goodmis.org> Content-Disposition: inline; filename=0054-drm-radeon-check-incoming-cliprects-pointer.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.5 stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook [ Upstream commit fefaedcfb82d2e57c2320acf60604ab03b750cc0 ] The "boxes" parameter points into userspace memory. It should be verified like any other operation against user memory. Signed-off-by: Kees Cook Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie Signed-off-by: Steven Rostedt --- drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 1fe98b4..9aa02be 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; -- 1.7.10.4