lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 059/247] serial: sifive: Sanitize CSIZE and c_iflag
    Date
    From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

    [ Upstream commit c069d2756c01ed36121fae6a42c14fdf1325c71d ]

    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: 45c054d0815b (tty: serial: add driver for the SiFive UART)
    Cc: Paul Walmsley <paul.walmsley@sifive.com>
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
    Link: https://lore.kernel.org/r/20220519081808.3776-7-ilpo.jarvinen@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/tty/serial/sifive.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/serial/sifive.c b/drivers/tty/serial/sifive.c
    index a579d46ed78c..4b0fa91e9f9a 100644
    --- a/drivers/tty/serial/sifive.c
    +++ b/drivers/tty/serial/sifive.c
    @@ -666,12 +666,16 @@ static void sifive_serial_set_termios(struct uart_port *port,
    int rate;
    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");
    + termios->c_cflag &= ~CSIZE;
    + termios->c_cflag |= CS8;
    + }
    if (termios->c_iflag & (INPCK | PARMRK))
    dev_err_once(ssp->port.dev, "parity checking not supported\n");
    if (termios->c_iflag & BRKINT)
    dev_err_once(ssp->port.dev, "BREAK detection not supported\n");
    + termios->c_iflag &= ~(INPCK|PARMRK|BRKINT);

    /* Set number of stop bits */
    nstop = (termios->c_cflag & CSTOPB) ? 2 : 1;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:02    [W:3.215 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site