summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2022-05-19 11:18:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-05-19 18:32:39 +0200
commit098333a9c7d12bb3ce44c82f08b4d810c44d31b0 (patch)
tree80b8ca583ada146cf47c9ba66e6c1d616e71569c /drivers/tty
parentfd63031b8c0763addcecdefe0e0c59d49646204e (diff)
downloadlinux-098333a9c7d12bb3ce44c82f08b4d810c44d31b0.tar.gz
linux-098333a9c7d12bb3ce44c82f08b4d810c44d31b0.tar.bz2
linux-098333a9c7d12bb3ce44c82f08b4d810c44d31b0.zip
serial: rda-uart: Don't allow CS5-6
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: c10b13325ced (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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/rda-uart.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/rda-uart.c b/drivers/tty/serial/rda-uart.c
index e5f1fded423a..f556b4955f59 100644
--- a/drivers/tty/serial/rda-uart.c
+++ b/drivers/tty/serial/rda-uart.c
@@ -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;