serial: 8250: Sanitize rs485 config harder

Amend the generic ->rs485_config() callback to sanitize RTS polarity and
zero-fill the padding (in addition to the existing sanitization of the
RTS delays).

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Matwey V. Kornilov <matwey@sai.msu.ru>
Link: https://lore.kernel.org/r/ff833721bc372d38678f289eb2a44dbf016d5203.1582895077.git.lukas@wunner.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 73244806d70198bfa565b584675c0fa651bd48af..d281aea061d6d380e9fcfb040b7a117bd829dc01 100644 (file)
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -676,10 +676,18 @@ int serial8250_em485_config(struct uart_port *port, struct serial_rs485 *rs485)
 {
        struct uart_8250_port *up = up_to_u8250p(port);
 
+       /* pick sane settings if the user hasn't */
+       if (!!(rs485->flags & SER_RS485_RTS_ON_SEND) ==
+           !!(rs485->flags & SER_RS485_RTS_AFTER_SEND)) {
+               rs485->flags |= SER_RS485_RTS_ON_SEND;
+               rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;
+       }
+
        /* clamp the delays to [0, 100ms] */
        rs485->delay_rts_before_send = min(rs485->delay_rts_before_send, 100U);
        rs485->delay_rts_after_send  = min(rs485->delay_rts_after_send, 100U);
 
+       memset(rs485->padding, 0, sizeof(rs485->padding));
        port->rs485 = *rs485;
 
        /*