diff options
| author | Johan Hovold <johan@kernel.org> | 2021-04-07 12:39:15 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2021-04-08 09:45:58 +0200 |
| commit | d370c90dcd64e427a79a093a070117a1571d4cd8 (patch) | |
| tree | 9bf0f427b6d849d0011043ff21b76fab10a2757c /drivers/usb/serial/ti_usb_3410_5052.c | |
| parent | 4c47dc2a3a00cb288fc4888691227927430e2683 (diff) | |
| download | linux-d370c90dcd64e427a79a093a070117a1571d4cd8.tar.gz | |
USB: serial: ti_usb_3410_5052: fix TIOCSSERIAL permission check
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
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
| -rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 9 |
1 files 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 4b497c1e850b19..bb50098a0ce66e 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; } |