From be656d0beb392dfba1621da1e4d389c40e170c7e Mon Sep 17 00:00:00 2001 From: John Ogness Date: Fri, 15 Mar 2024 15:38:22 +0000 Subject: [PATCH] printk: nbcon: Use driver synchronization while registering BugLink: https://bugs.launchpad.net/bugs/2060704 Depending on if an nbcon console is registered, a driver may handle its internal locking differently. If a driver is holding its internal lock while the nbcon console is registered, there may be a risk that two different contexts access the hardware simultaneously without synchronization. (For example, if the printk subsystem invokes atomic printing while another driver context acquired the internal lock without considering the atomic console.) Use the driver synchronization while a registering nbcon console transitions to being registered. This guarantees that if the driver acquires its internal lock when the nbcon console was not registered, it will remain unregistered until that context releases the lock. Signed-off-by: John Ogness Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kevin Becker --- kernel/printk/printk.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index b4b04bbc6f41..aa3c0be51845 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3474,6 +3474,7 @@ void register_console(struct console *newcon) struct console *con; bool bootcon_registered = false; bool realcon_registered = false; + unsigned long flags; int err; console_list_lock(); @@ -3565,6 +3566,19 @@ void register_console(struct console *newcon) newcon->seq = 0; } + /* + * If another context is actively using the hardware of this new + * console, it will not be aware of the nbcon synchronization. This + * is a risk that two contexts could access the hardware + * simultaneously if this new console is used for atomic printing + * and the other context is still using the hardware. + * + * Use the driver synchronization to ensure that the hardware is not + * in use while this new console transitions to being registered. + */ + if ((newcon->flags & CON_NBCON) && newcon->write_atomic) + newcon->device_lock(newcon, &flags); + /* * Put this console in the list - keep the * preferred driver at the head of the list. @@ -3589,6 +3603,10 @@ void register_console(struct console *newcon) * register_console() completes. */ + /* This new console is now registered. */ + if ((newcon->flags & CON_NBCON) && newcon->write_atomic) + newcon->device_unlock(newcon, flags); + console_sysfs_notify(); /*