linux-kernel - [PATCH 2/2] Revert "printk: Flag register_console() if console is set on command line"

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: <20240606114149.118633-2-tony.lindgren@linux.intel.com>
Date: Thu,  6 Jun 2024 14:41:47 +0300
From: Tony Lindgren <tony.lindgren@...ux.intel.com>
To: Petr Mladek <pmladek@...e.com>,
	Steven Rostedt <rostedt@...dmis.org>,
	John Ogness <john.ogness@...utronix.de>,
	Sergey Senozhatsky <senozhatsky@...omium.org>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Tony Lindgren <tony@...mide.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	linux-serial@...r.kernel.org,
	Tony Lindgren <tony.lindgren@...ux.intel.com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] Revert "printk: Flag register_console() if console is set on command line"

This reverts commit b73c9cbe4f1fc02645228aa575998dd54067f8ef.

There is no need for this change now that we are reserving console_cmdline
slots for the DEVNAME:0.0 style consoles.

Signed-off-by: Tony Lindgren <tony.lindgren@...ux.intel.com>
---
 kernel/printk/printk.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 52bdd7dcdb6f..8b746eeb77fa 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2541,9 +2541,6 @@ static int __init console_setup(char *str)
 	if (console_opt_save(str, brl_options))
 		return 1;
 
-	/* Flag register_console() to not call try_enable_default_console() */
-	console_set_on_cmdline = 1;
-
 	/* Don't attempt to parse a DEVNAME:0.0 style console */
 	if (strchr(str, ':')) {
 		reserve_deferred_console(str);
@@ -3578,7 +3575,7 @@ void register_console(struct console *newcon)
 	 * Note that a console with tty binding will have CON_CONSDEV
 	 * flag set and will be first in the list.
 	 */
-	if (preferred_console < 0 && !console_set_on_cmdline) {
+	if (preferred_console < 0) {
 		if (hlist_empty(&console_list) || !console_first()->device ||
 		    console_first()->flags & CON_BOOT) {
 			try_enable_default_console(newcon);
-- 
2.45.2