Henri reported a regression that when a custom bootlogo is exactly as
big as the screen, a white bar with the size of the font height is
displayed at the bottom of the display.  Fix this off-by-one bug.

Fixes: 94e6a058b168 ("fbcon: Fix KASAN slab-out-of-bounds Read in 
fbcon_prepare_logo")
Tested-by: Henri Roosen <[email protected]>
Signed-off-by: Helge Deller <[email protected]>
Cc: [email protected] # v7.3+
---
 drivers/video/fbdev/core/fbcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index d7890e119dc7..2809c7a6893f 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -666,7 +666,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct 
fb_info *info,
        logo_height = fb_prepare_logo(info, par->rotate);
        logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height);
        logo_lines = min(logo_lines, rows);
-       logo_lines = min(logo_lines, new_rows - 1);
+       logo_lines = min(logo_lines, new_rows);
        if (logo_lines <= 0) {
                logo_lines = 0;
                logo_shown = FBCON_LOGO_DONTSHOW;
-- 
2.56.1

Reply via email to