From: Johan Hovold <johan@kernel.org>
To: Johan Hovold <johan@kernel.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: [PATCH 14/24] USB: serial: ti_usb_3410_5052: fix TIOCSSERIAL permission check
Date: Wed, 7 Apr 2021 12:39:15 +0200 [thread overview]
Message-ID: <20210407103925.829-15-johan@kernel.org> (raw)
In-Reply-To: <20210407103925.829-1-johan@kernel.org>
Changing the port closing-wait parameter is a privileged operation so
make sure to return -EPERM if a regular user tries to change it.
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/ti_usb_3410_5052.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 4b497c1e850b..bb50098a0ce6 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1418,14 +1418,19 @@ static int ti_set_serial_info(struct tty_struct *tty,
struct serial_struct *ss)
{
struct usb_serial_port *port = tty->driver_data;
- struct ti_port *tport = usb_get_serial_port_data(port);
+ struct tty_port *tport = &port->port;
unsigned cwait;
cwait = ss->closing_wait;
if (cwait != ASYNC_CLOSING_WAIT_NONE)
cwait = msecs_to_jiffies(10 * ss->closing_wait);
- tport->tp_port->port.closing_wait = cwait;
+ if (!capable(CAP_SYS_ADMIN)) {
+ if (cwait != tport->closing_wait)
+ return -EPERM;
+ }
+
+ tport->closing_wait = cwait;
return 0;
}
--
2.26.3
next prev parent reply other threads:[~2021-04-07 10:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 10:39 [PATCH 00/24] USB: serial: TIOCSSERIAL fixes and generic support Johan Hovold
2021-04-07 10:39 ` [PATCH 01/24] USB: serial: ark3116: fix TIOCGSERIAL implementation Johan Hovold
2021-04-07 10:39 ` [PATCH 02/24] USB: serial: f81232: " Johan Hovold
2021-04-07 10:39 ` [PATCH 03/24] USB: serial: f81534: " Johan Hovold
2021-04-07 10:39 ` [PATCH 04/24] USB: serial: ftdi_sio: " Johan Hovold
2021-04-07 10:39 ` [PATCH 05/24] USB: serial: io_edgeport: " Johan Hovold
2021-04-07 10:39 ` [PATCH 06/24] USB: serial: io_ti: " Johan Hovold
2021-04-07 10:39 ` [PATCH 07/24] USB: serial: mos7720: " Johan Hovold
2021-04-07 10:39 ` [PATCH 08/24] USB: serial: mos7840: " Johan Hovold
2021-04-07 10:39 ` [PATCH 09/24] USB: serial: opticon: " Johan Hovold
2021-04-07 10:39 ` [PATCH 10/24] USB: serial: pl2303: " Johan Hovold
2021-04-07 10:39 ` [PATCH 11/24] USB: serial: quatech2: " Johan Hovold
2021-04-07 10:39 ` [PATCH 12/24] USB: serial: ssu100: " Johan Hovold
2021-04-07 10:39 ` [PATCH 13/24] USB: serial: ti_usb_3410_5052: " Johan Hovold
2021-04-07 10:39 ` Johan Hovold [this message]
2021-04-07 10:39 ` [PATCH 15/24] USB: serial: usb_wwan: fix TIOCSSERIAL jiffies conversions Johan Hovold
2021-04-07 10:39 ` [PATCH 16/24] USB: serial: usb_wwan: fix unprivileged TIOCCSERIAL Johan Hovold
2021-04-07 10:39 ` [PATCH 17/24] USB: serial: usb_wwan: fix TIOCGSERIAL implementation Johan Hovold
2021-04-07 10:39 ` [PATCH 18/24] USB: serial: whiteheat: " Johan Hovold
2021-04-07 10:39 ` [PATCH 19/24] USB: serial: fix return value for unsupported ioctls Johan Hovold
2021-04-07 10:39 ` [PATCH 20/24] USB: serial: add generic support for TIOCSSERIAL Johan Hovold
2021-04-07 10:39 ` [PATCH 21/24] USB: serial: stop reporting legacy UART types Johan Hovold
2021-04-07 10:39 ` [PATCH 22/24] USB: serial: ftdi_sio: ignore baud_base changes Johan Hovold
2021-04-07 10:39 ` [PATCH 23/24] USB: serial: ftdi_sio: simplify TIOCGSERIAL permission check Johan Hovold
2021-04-07 10:39 ` [PATCH 24/24] USB: serial: ftdi_sio: clean up TIOCSSERIAL Johan Hovold
2021-04-07 15:23 ` [PATCH 00/24] USB: serial: TIOCSSERIAL fixes and generic support Greg KH
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=20210407103925.829-15-johan@kernel.org \
--to=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.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;
as well as URLs for NNTP newsgroup(s).