From: David Lechner <david@lechnology.com>
Date: Fri, 18 Aug 2017 17:56:40 +0000 (+0200)
Subject: fbdev: fix 1bpp logo for unusual width
X-Git-Tag: Ubuntu-5.2.0-15.16~5981^2~25
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=16622a8e7e46fab31fd33ca5a23672385de240f6;p=mirror_ubuntu-eoan-kernel.git

fbdev: fix 1bpp logo for unusual width

This check is needed in the case where the width of the framebuffer
is not a multiple of 8 pixels. For example, LEGO MINDSTORMS EV3 has
a 178x128 1bpp display.

Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index f8ced1434edf..a35f788b778b 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -316,7 +316,7 @@ static void fb_set_logo(struct fb_info *info,
 		for (i = 0; i < logo->height; i++) {
 			for (j = 0; j < logo->width; src++) {
 				d = *src ^ xor;
-				for (k = 7; k >= 0; k--) {
+				for (k = 7; k >= 0 && j < logo->width; k--) {
 					*dst++ = ((d >> k) & 1) ? fg : 0;
 					j++;
 				}