From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [RFC][PATCH 2/2] printk: take console_sem when accessing console drivers list
Date: Tue, 23 Apr 2019 15:25:11 +0900 [thread overview]
Message-ID: <20190423062511.1118-3-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20190423062511.1118-1-sergey.senozhatsky@gmail.com>
We need to take console_sem lock when we iterate console
drivers list. Otherwise, another CPU can concurrently
modify console drivers list or console drivers.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
kernel/printk/printk.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b0e361ca1bea..c2bccf58d03e 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2674,12 +2674,17 @@ void register_console(struct console *newcon)
struct console_cmdline *c;
static bool has_preferred;
- if (console_drivers)
- for_each_console(bcon)
- if (WARN(bcon == newcon,
- "console '%s%d' already registered\n",
- bcon->name, bcon->index))
- return;
+ console_lock();
+ if (console_drivers) {
+ for_each_console(bcon) {
+ if (bcon != newcon)
+ continue;
+ WARN(1, "console '%s%d' already registered\n",
+ bcon->name, bcon->index);
+ console_unlock();
+ return;
+ }
+ }
/*
* before we register a new CON_BOOT console, make sure we don't
@@ -2691,6 +2696,7 @@ void register_console(struct console *newcon)
if (!(bcon->flags & CON_BOOT)) {
pr_info("Too late to register bootconsole %s%d\n",
newcon->name, newcon->index);
+ console_unlock();
return;
}
}
@@ -2701,6 +2707,7 @@ void register_console(struct console *newcon)
if (!has_preferred || bcon || !console_drivers)
has_preferred = preferred_console >= 0;
+ console_unlock();
/*
* See if we want to use this console driver. If we
--
2.21.0
next prev parent reply other threads:[~2019-04-23 6:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 6:25 [RFC][PATCH 0/2] Access console drivers list under console_sem Sergey Senozhatsky
2019-04-23 6:25 ` [RFC][PATCH 1/2] printk: lock console_sem before we unregister boot consoles Sergey Senozhatsky
2019-04-24 14:49 ` Petr Mladek
2019-04-25 3:52 ` Sergey Senozhatsky
2019-04-25 6:43 ` Sergey Senozhatsky
2019-04-25 9:20 ` Petr Mladek
2019-04-25 16:05 ` Steven Rostedt
2019-04-25 7:50 ` Petr Mladek
2019-04-25 7:56 ` Sergey Senozhatsky
2019-04-25 9:37 ` Sergey Senozhatsky
2019-04-23 6:25 ` Sergey Senozhatsky [this message]
2019-04-24 15:13 ` [RFC][PATCH 2/2] printk: take console_sem when accessing console drivers list Petr Mladek
2019-04-25 5:19 ` Sergey Senozhatsky
2019-04-25 6:47 ` Sergey Senozhatsky
2019-04-25 8:53 ` Petr Mladek
2019-04-23 13:48 ` [RFC][PATCH 0/2] Access console drivers list under console_sem Steven Rostedt
2019-04-24 5:43 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190423062511.1118-3-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky.work@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®