framebuffer: fix screen corruption when copying

The function bitcpy_rev has a bug that may result in screen corruption.
The bug happens under these conditions:
* the end of the destination area of a copy operation is aligned on a long
  word boundary
* the end of the source area is not aligned on a long word boundary
* we are copying more than one long word

In this case, the variable shift is non-zero and the variable first is
zero. The statements FB_WRITEL(comp(d0, FB_READL(dst), first), dst) reads
the last long word of the destination and writes it back unchanged
(because first is zero). Correctly, we should write the variable d0 to the
last word of the destination in this case.

This patch fixes the bug by introducing and extra test if first is zero.

The patch also removes the references to fb_memmove in the code that is
commented out because fb_memmove was removed from framebuffer subsystem.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/core/cfbcopyarea.c b/drivers/video/fbdev/core/cfbcopyarea.c
index bcb57235fcc70c8b389f9bf1134e59a6f9a2adb3..6d4bfeecee35088f86d257d871c40ad934f79737 100644 (file)
--- a/drivers/video/fbdev/core/cfbcopyarea.c
+++ b/drivers/video/fbdev/core/cfbcopyarea.c
@@ -55,8 +55,8 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, unsigned dst_idx,
         * If you suspect bug in this function, compare it with this simple
         * memmove implementation.
         */
-       fb_memmove((char *)dst + ((dst_idx & (bits - 1))) / 8,
-                  (char *)src + ((src_idx & (bits - 1))) / 8, n / 8);
+       memmove((char *)dst + ((dst_idx & (bits - 1))) / 8,
+               (char *)src + ((src_idx & (bits - 1))) / 8, n / 8);
        return;
 #endif
 
@@ -221,8 +221,8 @@ bitcpy_rev(struct fb_info *p, unsigned long __iomem *dst, unsigned dst_idx,
         * If you suspect bug in this function, compare it with this simple
         * memmove implementation.
         */
-       fb_memmove((char *)dst + ((dst_idx & (bits - 1))) / 8,
-                  (char *)src + ((src_idx & (bits - 1))) / 8, n / 8);
+       memmove((char *)dst + ((dst_idx & (bits - 1))) / 8,
+               (char *)src + ((src_idx & (bits - 1))) / 8, n / 8);
        return;
 #endif
 
@@ -324,7 +324,10 @@ bitcpy_rev(struct fb_info *p, unsigned long __iomem *dst, unsigned dst_idx,
                                d0 = d0 << left | d1 >> right;
                        }
                        d0 = fb_rev_pixels_in_long(d0, bswapmask);
-                       FB_WRITEL(comp(d0, FB_READL(dst), first), dst);
+                       if (!first)
+                               FB_WRITEL(d0, dst);
+                       else
+                               FB_WRITEL(comp(d0, FB_READL(dst), first), dst);
                        d0 = d1;
                        dst--;
                        n -= dst_idx+1;