Skip to content

Commit

Permalink
serial: protect uart_port_dtr_rts() in uart_shutdown() too
Browse files Browse the repository at this point in the history
mainline inclusion
from mainline-v6.12-rc1
commit 602babaa84d627923713acaf5f7e9a4369e77473
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYREU
CVE: CVE-2024-50058

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=602babaa84d627923713acaf5f7e9a4369e77473

--------------------------------

Commit af224ca (serial: core: Prevent unsafe uart port access, part
3) added few uport == NULL checks. It added one to uart_shutdown(), so
the commit assumes, uport can be NULL in there. But right after that
protection, there is an unprotected "uart_port_dtr_rts(uport, false);"
call. That is invoked only if HUPCL is set, so I assume that is the
reason why we do not see lots of these reports.

Or it cannot be NULL at this point at all for some reason :P.

Until the above is investigated, stay on the safe side and move this
dereference to the if too.

I got this inconsistency from Coverity under CID 1585130. Thanks.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20240805102046.307511-3-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Conflicts:
	drivers/tty/serial/serial_core.c
[Conflicts due to 5d42039("tty: Convert ->dtr_rts() to take bool
argument") not merged]
Signed-off-by: Yi Yang <yiyang13@huawei.com>
  • Loading branch information
Jiri Slaby (SUSE) authored and Yi Yang committed Nov 1, 2024
1 parent c78205e commit 2fd4f20
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,16 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
/*
* Turn off DTR and RTS early.
*/
if (uport && uart_console(uport) && tty) {
uport->cons->cflag = tty->termios.c_cflag;
uport->cons->ispeed = tty->termios.c_ispeed;
uport->cons->ospeed = tty->termios.c_ospeed;
}
if (uport) {
if (uart_console(uport) && tty) {
uport->cons->cflag = tty->termios.c_cflag;
uport->cons->ispeed = tty->termios.c_ispeed;
uport->cons->ospeed = tty->termios.c_ospeed;
}

if (!tty || C_HUPCL(tty))
uart_port_dtr_rts(uport, 0);
if (!tty || C_HUPCL(tty))
uart_port_dtr_rts(uport, 0);
}

uart_port_shutdown(port);
}
Expand Down

0 comments on commit 2fd4f20

Please sign in to comment.