Commit 1c0face9 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds

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: default avatarRoel 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 091c82c0
...@@ -2593,13 +2593,16 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area) ...@@ -2593,13 +2593,16 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
width = x2 - dx; width = x2 - dx;
height = y2 - dy; height = y2 - dy;
if (area->sx + dx < area->dx || area->sy + dy < area->dy)
return;
/* update sx,sy */ /* update sx,sy */
sx = area->sx + (dx - area->dx); sx = area->sx + (dx - area->dx);
sy = area->sy + (dy - area->dy); sy = area->sy + (dy - area->dy);
/* the source must be completely inside the virtual screen */ /* the source must be completely inside the virtual screen */
if (sx < 0 || sy < 0 || (sx + width) > info->var.xres_virtual || if (sx + width > info->var.xres_virtual ||
(sy + height) > info->var.yres_virtual) sy + height > info->var.yres_virtual)
return; return;
if (dy > sy || (dy == sy && dx > sx)) { if (dy > sy || (dy == sy && dx > sx)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment