提交 52817df0 编写于 作者: I Ilpo Järvinen 提交者: Zheng Zengkai

serial: sifive: Sanitize CSIZE and c_iflag

stable inclusion
from stable-v5.10.122
commit afcfc3183cfdae02962c2194f1a207934a2cce1e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5W6OE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=afcfc3183cfdae02962c2194f1a207934a2cce1e

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

[ Upstream commit c069d275 ]

Only CS8 is supported but CSIZE was not sanitized 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().

Similarly, INPCK, PARMRK, and BRKINT are reported textually unsupported
but were not cleared in termios c_iflag which is the machine-readable
format.

Fixes: 45c054d0 (tty: serial: add driver for the SiFive UART)
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220519081808.3776-7-ilpo.jarvinen@linux.intel.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 984ab327
...@@ -667,12 +667,16 @@ static void sifive_serial_set_termios(struct uart_port *port, ...@@ -667,12 +667,16 @@ static void sifive_serial_set_termios(struct uart_port *port,
int rate; int rate;
char nstop; char nstop;
if ((termios->c_cflag & CSIZE) != CS8) if ((termios->c_cflag & CSIZE) != CS8) {
dev_err_once(ssp->port.dev, "only 8-bit words supported\n"); dev_err_once(ssp->port.dev, "only 8-bit words supported\n");
termios->c_cflag &= ~CSIZE;
termios->c_cflag |= CS8;
}
if (termios->c_iflag & (INPCK | PARMRK)) if (termios->c_iflag & (INPCK | PARMRK))
dev_err_once(ssp->port.dev, "parity checking not supported\n"); dev_err_once(ssp->port.dev, "parity checking not supported\n");
if (termios->c_iflag & BRKINT) if (termios->c_iflag & BRKINT)
dev_err_once(ssp->port.dev, "BREAK detection not supported\n"); dev_err_once(ssp->port.dev, "BREAK detection not supported\n");
termios->c_iflag &= ~(INPCK|PARMRK|BRKINT);
/* Set number of stop bits */ /* Set number of stop bits */
nstop = (termios->c_cflag & CSTOPB) ? 2 : 1; nstop = (termios->c_cflag & CSTOPB) ? 2 : 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册