mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
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>
This commit is contained in:
parent
1c0face9d4
commit
77a6e7abb0
1 changed files with 4 additions and 1 deletions
|
@ -1087,12 +1087,15 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
|
||||||
width = x2 - dx;
|
width = x2 - dx;
|
||||||
height = y2 - dy;
|
height = y2 - dy;
|
||||||
|
|
||||||
|
if (sx + dx < old_dx || sy + dy < old_dy)
|
||||||
|
return;
|
||||||
|
|
||||||
/* update sx1,sy1 */
|
/* update sx1,sy1 */
|
||||||
sx += (dx - old_dx);
|
sx += (dx - old_dx);
|
||||||
sy += (dy - old_dy);
|
sy += (dy - old_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) > vxres || (sy + height) > vyres)
|
if (sx + width > vxres || sy + height > vyres)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
switch (info->fix.type) {
|
switch (info->fix.type) {
|
||||||
|
|
Loading…
Reference in a new issue