aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRoel Kluin <12o3l@tiscali.nl>2008-07-24 00:31:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 13:47:37 -0400
commit77a6e7abb09de0e85a15e2fe42c21ffc59847759 (patch)
tree94ddd7718d173edcd406457d0bef7d9dea79c0f9 /drivers/video
parent1c0face9d4024bf942096297937759bdf0e1aeac (diff)
vga16fb: test virtual screen range before subtraction on unsigned
dx and dy are u32's, so the test should occur before the subtraction Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Cc: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/vga16fb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 9b3c5923365e..9d2751717896 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1087,12 +1087,15 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
1087 width = x2 - dx; 1087 width = x2 - dx;
1088 height = y2 - dy; 1088 height = y2 - dy;
1089 1089
1090 if (sx + dx < old_dx || sy + dy < old_dy)
1091 return;
1092
1090 /* update sx1,sy1 */ 1093 /* update sx1,sy1 */
1091 sx += (dx - old_dx); 1094 sx += (dx - old_dx);
1092 sy += (dy - old_dy); 1095 sy += (dy - old_dy);
1093 1096
1094 /* the source must be completely inside the virtual screen */ 1097 /* the source must be completely inside the virtual screen */
1095 if (sx < 0 || sy < 0 || (sx + width) > vxres || (sy + height) > vyres) 1098 if (sx + width > vxres || sy + height > vyres)
1096 return; 1099 return;
1097 1100
1098 switch (info->fix.type) { 1101 switch (info->fix.type) {