xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: msm_serial: disable interrupts in __msm_console_write()

Browse Source 
[ Upstream commit aabdbb1b7a5819e18c403334a31fb0cc2c06ad41 ]

__msm_console_write() assumes that interrupts are disabled, but
with threaded console printers it is possible that the write()
callback of the console is called with interrupts enabled.

Explicitly disable interrupts using local_irq_save() to preserve
the assumed context.

Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Link: https://lore.kernel.org/r/20220506213324.470461-1-john.ogness@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
John Ogness
2022-05-06 23:39:24 +02:06
committed by Greg Kroah-Hartman
parent ff727ab0b7
commit 1e3b3a5762
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/msm_serial.c
View File

@@ -1593,6 +1593,7 @@ static inline struct uart_port *msm_get_port_from_line(unsigned int line)
static void __msm_console_write(struct uart_port *port, const char *s, static void __msm_console_write(struct uart_port *port, const char *s,
unsigned int count, bool is_uartdm) unsigned int count, bool is_uartdm)
{ {
unsigned long flags;
int i; int i;
int num_newlines = 0; int num_newlines = 0;
bool replaced = false; bool replaced = false;
@@ -1610,6 +1611,8 @@ static void __msm_console_write(struct uart_port *port, const char *s,
num_newlines++; num_newlines++;
count += num_newlines; count += num_newlines;
local_irq_save(flags);
if (port->sysrq) if (port->sysrq)
locked = 0; locked = 0;
else if (oops_in_progress) else if (oops_in_progress)
@@ -1655,6 +1658,8 @@ static void __msm_console_write(struct uart_port *port, const char *s,
if (locked) if (locked)
spin_unlock(&port->lock); spin_unlock(&port->lock);
local_irq_restore(flags);
} }
static void msm_console_write(struct console *co, const char *s, static void msm_console_write(struct console *co, const char *s,