Skip to content

Commit

Permalink
USB: serial: ftdi_sio: clean up ioctl handler
Browse files Browse the repository at this point in the history
Clean up the ioctl handler and make sure to pass an unsigned-int rather
than serial_struct pointer to the TIOCSERGETLSR helper as this it what
the user argument really is.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
  • Loading branch information
Johan Hovold committed Jan 26, 2017
1 parent c6dce26 commit 5955660
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ static int set_serial_info(struct tty_struct *tty,
}

static int get_lsr_info(struct usb_serial_port *port,
struct serial_struct __user *retinfo)
unsigned int __user *retinfo)
{
struct ftdi_private *priv = usb_get_serial_port_data(port);
unsigned int result = 0;
Expand Down Expand Up @@ -2485,20 +2485,15 @@ static int ftdi_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = tty->driver_data;
void __user *argp = (void __user *)arg;

/* Based on code from acm.c and others */
switch (cmd) {

case TIOCGSERIAL: /* gets serial port data */
return get_serial_info(port,
(struct serial_struct __user *) arg);

case TIOCSSERIAL: /* sets serial port data */
return set_serial_info(tty, port,
(struct serial_struct __user *) arg);
case TIOCGSERIAL:
return get_serial_info(port, argp);
case TIOCSSERIAL:
return set_serial_info(tty, port, argp);
case TIOCSERGETLSR:
return get_lsr_info(port, (struct serial_struct __user *)arg);
break;
return get_lsr_info(port, argp);
default:
break;
}
Expand Down

0 comments on commit 5955660

Please sign in to comment.