Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a6e7ab authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds
Browse files

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: default avatarRoel Kluin <12o3l@tiscali.nl>
Cc: Antonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c0face9

drivers/video/vga16fb.c

+4 −1
Original line number Diff line number Diff line
@@ -1087,12 +1087,15 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are 
	width = x2 - dx;

	height = y2 - dy;



	if (sx + dx < old_dx || sy + dy < old_dy)

		return;



	/* update sx1,sy1 */

	sx += (dx - old_dx);

	sy += (dy - old_dy);



	/* 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;



	switch (info->fix.type) {