From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>,
shawnguo@kernel.org, s.hauer@pengutronix.de,
mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com,
cniedermaier@dh-electronics.com,
LKML <linux-kernel@vger.kernel.org>,
linux-serial <linux-serial@vger.kernel.org>,
LinoSanfilippo@gmx.de, Lukas Wunner <lukas@wunner.de>,
p.rosenberger@kunbus.com, stable@vger.kernel.org
Subject: Re: [PATCH v3 3/6] serial: core: fix sanitizing check for RTS settings
Date: Thu, 12 Oct 2023 16:10:27 +0300 (EEST) [thread overview]
Message-ID: <40e4c6b1-e217-2926-a351-bf685a5b775f@linux.intel.com> (raw)
In-Reply-To: <20231011181544.7893-4-l.sanfilippo@kunbus.com>
On Wed, 11 Oct 2023, Lino Sanfilippo wrote:
> Among other things uart_sanitize_serial_rs485() tests the sanity of the RTS
> settings in a RS485 configuration that has been passed by userspace.
> If RTS-on-send and RTS-after-send are both set or unset the configuration
> is adjusted and RTS-after-send is disabled and RTS-on-send enabled.
>
> This however makes only sense if both RTS modes are actually supported by
> the driver.
>
> With commit be2e2cb1d281 ("serial: Sanitize rs485_struct") the code does
> take the driver support into account but only checks if one of both RTS
> modes are supported. This may lead to the errorneous result of RTS-on-send
> being set even if only RTS-after-send is supported.
>
> Fix this by changing the implemented logic: First clear all unsupported
> flags in the RS485 configuration, then adjust an invalid RTS setting by
> taking into account which RTS mode is supported.
>
> Cc: stable@vger.kernel.org
> Fixes: be2e2cb1d281 ("serial: Sanitize rs485_struct")
> Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
> ---
> drivers/tty/serial/serial_core.c | 28 ++++++++++++++++++----------
> 1 file changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
> index 697c36dc7ec8..f4feebf8200f 100644
> --- a/drivers/tty/serial/serial_core.c
> +++ b/drivers/tty/serial/serial_core.c
> @@ -1370,19 +1370,27 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4
> return;
> }
>
> + rs485->flags &= supported_flags;
> +
> /* Pick sane settings if the user hasn't */
> - if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) &&
> - !(rs485->flags & SER_RS485_RTS_ON_SEND) ==
> + if (!(rs485->flags & SER_RS485_RTS_ON_SEND) ==
> !(rs485->flags & SER_RS485_RTS_AFTER_SEND)) {
> - dev_warn_ratelimited(port->dev,
> - "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n",
> - port->name, port->line);
> - rs485->flags |= SER_RS485_RTS_ON_SEND;
> - rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;
> - supported_flags |= SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND;
> - }
> + if (supported_flags & SER_RS485_RTS_ON_SEND) {
> + rs485->flags |= SER_RS485_RTS_ON_SEND;
> + rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;
>
> - rs485->flags &= supported_flags;
> + dev_warn_ratelimited(port->dev,
> + "%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n",
> + port->name, port->line);
> + } else {
> + rs485->flags |= SER_RS485_RTS_AFTER_SEND;
> + rs485->flags &= ~SER_RS485_RTS_ON_SEND;
So if neither of the flags is supported, what will happen? You might want
add if after that else?
--
i.
next prev parent reply other threads:[~2023-10-12 13:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20231011181544.7893-1-l.sanfilippo@kunbus.com>
2023-10-11 18:15 ` [PATCH v3 1/6] serial: Do not hold the port lock when setting rx-during-tx GPIO Lino Sanfilippo
2023-10-11 22:36 ` Hugo Villeneuve
2023-10-12 11:17 ` Lino Sanfilippo
2023-10-11 18:15 ` [PATCH v3 2/6] serial: core: set missing supported flag for RX during TX GPIO Lino Sanfilippo
2023-10-11 18:15 ` [PATCH v3 3/6] serial: core: fix sanitizing check for RTS settings Lino Sanfilippo
2023-10-12 13:10 ` Ilpo Järvinen [this message]
2023-10-12 21:01 ` Lino Sanfilippo
2023-10-13 10:24 ` Ilpo Järvinen
2023-10-14 12:23 ` Lino Sanfilippo
2023-10-16 10:05 ` Ilpo Järvinen
2023-10-16 10:10 ` Lino Sanfilippo
2023-10-11 18:15 ` [PATCH v3 4/6] serial: core: make sure RS485 cannot be enabled when it is not supported Lino Sanfilippo
2023-10-11 18:15 ` [PATCH v3 5/6] serial: core, imx: do not set RS485 enabled if " Lino Sanfilippo
2023-10-11 18:15 ` [PATCH v3 6/6] serial: omap: do not override settings for RS485 support Lino Sanfilippo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40e4c6b1-e217-2926-a351-bf685a5b775f@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=LinoSanfilippo@gmx.de \
--cc=alexandre.torgue@foss.st.com \
--cc=cniedermaier@dh-electronics.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=l.sanfilippo@kunbus.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=p.rosenberger@kunbus.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox