Messages in this thread Patch in this message | | | Date | Wed, 23 Apr 2008 20:55:28 +0200 | From | Roel Kluin <> | Subject | [PATCH] amifb: test virtual screen range before subtraction on unsigned |
| |
and another, --- dx and dy are u32's, so the test should occur before the subtraction
Signed-off-by: Roel Kluin <12o3l@tiscali.nl> --- diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 4c9ec3f..cc62349 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -2048,13 +2048,16 @@ static void amifb_copyarea(struct fb_info *info, 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)) {
| |