serial: sh-sci: Don't allow CS5-6

[ Upstream commit 9b87162de8be26bf3156460b37deee6399fd0fcb ]

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

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: 1da177e4c3f4 (Linux-2.6.12-rc2)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220519081808.3776-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 89ee43061d3ae5aa77565c44394920fb4a591f0a..c5c0f39cb1c77f47507f1d4af37e663de7d56042 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2390,8 +2390,12 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
        int best_clk = -1;
        unsigned long flags;
 
-       if ((termios->c_cflag & CSIZE) == CS7)
+       if ((termios->c_cflag & CSIZE) == CS7) {
                smr_val |= SCSMR_CHR;
+       } else {
+               termios->c_cflag &= ~CSIZE;
+               termios->c_cflag |= CS8;
+       }
        if (termios->c_cflag & PARENB)
                smr_val |= SCSMR_PE;
        if (termios->c_cflag & PARODD)