Skip to content

Commit

Permalink
serial: rda-uart: Don't allow CS5-6
Browse files Browse the repository at this point in the history
[ Upstream commit 098333a ]

Only CS7 and CS8 are supported but CSIZE is not sanitized after
fallthrough from CS5 or CS6 to CS7.

Set CSIZE correctly so that userspace knows the effective value.
Incorrect CSIZE also results in miscalculation of the frame bits in
tty_get_char_size() or in its predecessor where the roughly the same
code is directly within uart_update_timeout().

Fixes: c10b133 (tty: serial: Add RDA8810PL UART driver)
Cc: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220519081808.3776-4-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
ij-intel authored and gregkh committed Jun 14, 2022
1 parent ff4ce29 commit 22e9757
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/tty/serial/rda-uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ static void rda_uart_set_termios(struct uart_port *port,
fallthrough;
case CS7:
ctrl &= ~RDA_UART_DBITS_8;
termios->c_cflag &= ~CSIZE;
termios->c_cflag |= CS7;
break;
default:
ctrl |= RDA_UART_DBITS_8;
Expand Down

0 comments on commit 22e9757

Please sign in to comment.