linux-kernel - [PATCH 5.1 061/155] fbcon: Dont reset logo

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190613075656.477705080@linuxfoundation.org>
Date:   Thu, 13 Jun 2019 10:32:53 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Andreas Schwab <schwab@...ux-m68k.org>,
        Prarit Bhargava <prarit@...hat.com>,
        Yisheng Xie <ysxie@...mail.com>,
        Kees Cook <keescook@...omium.org>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Steven Rostedt <rostedt@...dmis.org>,
        Marko Myllynen <myllynen@...hat.com>,
        Hans de Goede <hdegoede@...hat.com>,
        Thierry Reding <treding@...dia.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
        Sasha Levin <sashal@...nel.org>
Subject: [PATCH 5.1 061/155] fbcon: Dont reset logo_shown when logo is currently shown

[ Upstream commit 3c5a1b111373e669c8220803464c3a508a87e254 ]

When the logo is currently drawn on a virtual console, and the console
loglevel is reduced to quiet, logo_shown must be left alone, so that it
the scrolling region on that virtual console is properly reset.

Fixes: 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots")
Signed-off-by: Andreas Schwab <schwab@...ux-m68k.org>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Yisheng Xie <ysxie@...mail.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Daniel Vetter <daniel.vetter@...ll.ch>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Marko Myllynen <myllynen@...hat.com>
Cc: Hans de Goede <hdegoede@...hat.com>
Cc: Thierry Reding <treding@...dia.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
 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 c59b23f6e9ba..a9c69ae30878 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init)
 
 	cap = info->flags;
 
-	if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
+	if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
 		logo_shown = FBCON_LOGO_DONTSHOW;
 
 	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
-- 
2.20.1