drm/i810: Prevent underflow in ioctl
Subsystems (3)
PATCH 1/1 drm/i810: Prevent underflow in ioctl
The "used" variables here come from the user in the ioctl and it can be negative. It could result in an out of bounds write.
--- drivers/gpu/drm/i810/i810_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i810/i810_dma.c +2 -2
@@ -728,7 +728,7 @@ static void i810_dma_dispatch_vertex(struct drm_device *dev,if (nbox >I810_NR_SAREA_CLIPRECTS ) nbox =I810_NR_SAREA_CLIPRECTS ; -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ;if (sarea_priv->dirty)
@@ -1048,7 +1048,7 @@ static void i810_dma_dispatch_mc(struct drm_device *dev, struct drm_buf *buf, inif (u !=I810_BUF_CLIENT )DRM_DEBUG ("MC found buffer that isn't mine!\n" ); -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ; sarea_priv->dirty =0x7f ;
Signature · 1 line
2.20.1
Quoting Dan Carpenter (2019-10-04 11:22:51)
Quoted 13 lines
The "used" variables here come from the user in the ioctl and it can be negative. It could result in an out of bounds write.
Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/i810/i810_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i810/i810_dma.c +0
-0
drivers/gpu/drm/i810/i810_dma.c static void i810_dma_dispatch_vertex(struct drm_device *dev, · line 732
Quoted 6 lines
drivers/gpu/drm/i810/i810_dma.c +1
-1@@ -728,7 +728,7 @@ static void i810_dma_dispatch_vertex(struct drm_device *dev,if (nbox >I810_NR_SAREA_CLIPRECTS ) nbox =I810_NR_SAREA_CLIPRECTS ; -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ;
Yes, as passed to the GPU instruction, negative used is invalid.
Then it is used as an offset into a memblock, where a negative offset would be very bad.
-Chris
Chris Wilson
AppliedQuoting Chris Wilson (2019-10-04 15:08:57)
Quoted 23 lines
Quoting Dan Carpenter (2019-10-04 11:22:51)
Quoted 13 lines
The "used" variables here come from the user in the ioctl and it can be negative. It could result in an out of bounds write.
Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/i810/i810_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i810/i810_dma.c +0
-0drivers/gpu/drm/i810/i810_dma.c static void i810_dma_dispatch_vertex(struct drm_device *dev, · line 732
Quoted 6 lines
drivers/gpu/drm/i810/i810_dma.c +1
-1@@ -728,7 +728,7 @@ static void i810_dma_dispatch_vertex(struct drm_device *dev,if (nbox >I810_NR_SAREA_CLIPRECTS ) nbox =I810_NR_SAREA_CLIPRECTS ; -if (used >4 *1024 ) +if (used <0 || used >4 *1024 ) used =0 ;Yes, as passed to the GPU instruction, negative used is invalid.
Quoted 4 lines
Then it is used as an offset into a memblock, where a negative offset would be very bad.
Reviewed-by Chris Wilson <[email protected]>
Applied to drm-misc-next with cc'ed stable.
-Chris