diff --git a/[refs] b/[refs] index 0d9c28459167..8c123b274106 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c0face9d4024bf942096297937759bdf0e1aeac +refs/heads/master: 77a6e7abb09de0e85a15e2fe42c21ffc59847759 diff --git a/trunk/drivers/video/vga16fb.c b/trunk/drivers/video/vga16fb.c index 9b3c5923365e..9d2751717896 100644 --- a/trunk/drivers/video/vga16fb.c +++ b/trunk/drivers/video/vga16fb.c @@ -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) {