hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Roel Kluin 2008-07-23 21:31:18 -07:00 committed by Linus Torvalds
parent 091c82c012
commit 1c0face9d4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/atafb.c
View File

@ -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)) {