summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRoel Kluin <12o3l@tiscali.nl>2008-07-24 06:31:18 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 19:47:37 +0200
commit1c0face9d4024bf942096297937759bdf0e1aeac (patch)
tree7476e3d9697d313eaf963840ff3d1a9342aa1626 /drivers
parentamifb: test virtual screen range before subtraction on unsigned (diff)
downloadlinux-1c0face9d4024bf942096297937759bdf0e1aeac.tar.xz
linux-1c0face9d4024bf942096297937759bdf0e1aeac.zip
atafb: 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: Tim Schmielau <tim@physik3.uni-rostock.de> Cc: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Antonino Daplas <adaplas@pol.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/atafb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index fa55d356b535..77eb8b34fbfa 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2593,13 +2593,16 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
width = x2 - dx;
height = y2 - dy;
+ if (area->sx + dx < area->dx || area->sy + dy < area->dy)
+ return;
+
/* update sx,sy */
sx = area->sx + (dx - area->dx);
sy = area->sy + (dy - area->dy);
/* the source must be completely inside the virtual screen */
- if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual ||
- (sy + height) > info->var.yres_virtual)
+ if (sx + width > info->var.xres_virtual ||
+ sy + height > info->var.yres_virtual)
return;
if (dy > sy || (dy == sy && dx > sx)) {