Commit 7b245969 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: io_ti: fix use-after-free in TIOCMIWAIT

Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.

This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.

Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33357625
...@@ -87,9 +87,6 @@ struct edgeport_port { ...@@ -87,9 +87,6 @@ struct edgeport_port {
int close_pending; int close_pending;
int lsr_event; int lsr_event;
struct async_icount icount; struct async_icount icount;
wait_queue_head_t delta_msr_wait; /* for handling sleeping while
waiting for msr change to
happen */
struct edgeport_serial *edge_serial; struct edgeport_serial *edge_serial;
struct usb_serial_port *port; struct usb_serial_port *port;
__u8 bUartMode; /* Port type, 0: RS232, etc. */ __u8 bUartMode; /* Port type, 0: RS232, etc. */
...@@ -1459,7 +1456,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr) ...@@ -1459,7 +1456,7 @@ static void handle_new_msr(struct edgeport_port *edge_port, __u8 msr)
icount->dcd++; icount->dcd++;
if (msr & EDGEPORT_MSR_DELTA_RI) if (msr & EDGEPORT_MSR_DELTA_RI)
icount->rng++; icount->rng++;
wake_up_interruptible(&edge_port->delta_msr_wait); wake_up_interruptible(&edge_port->port->delta_msr_wait);
} }
/* Save the new modem status */ /* Save the new modem status */
...@@ -1754,7 +1751,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -1754,7 +1751,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
dev = port->serial->dev; dev = port->serial->dev;
memset(&(edge_port->icount), 0x00, sizeof(edge_port->icount)); memset(&(edge_port->icount), 0x00, sizeof(edge_port->icount));
init_waitqueue_head(&edge_port->delta_msr_wait);
/* turn off loopback */ /* turn off loopback */
status = ti_do_config(edge_port, UMPC_SET_CLR_LOOPBACK, 0); status = ti_do_config(edge_port, UMPC_SET_CLR_LOOPBACK, 0);
...@@ -2434,10 +2430,14 @@ static int edge_ioctl(struct tty_struct *tty, ...@@ -2434,10 +2430,14 @@ static int edge_ioctl(struct tty_struct *tty,
dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__); dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__);
cprev = edge_port->icount; cprev = edge_port->icount;
while (1) { while (1) {
interruptible_sleep_on(&edge_port->delta_msr_wait); interruptible_sleep_on(&port->delta_msr_wait);
/* see if a signal did it */ /* see if a signal did it */
if (signal_pending(current)) if (signal_pending(current))
return -ERESTARTSYS; return -ERESTARTSYS;
if (port->serial->disconnected)
return -EIO;
cnow = edge_port->icount; cnow = edge_port->icount;
if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
cnow.dcd == cprev.dcd && cnow.cts == cprev.cts) cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment