Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc98ab87 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: ti_usb_3410_5052: 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 43a66b4c

drivers/usb/serial/ti_usb_3410_5052.c

+6 −4
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ struct ti_port { 
	int			tp_flags;

	int			tp_closing_wait;/* in .01 secs */

	struct async_icount	tp_icount;

	wait_queue_head_t	tp_msr_wait;	/* wait for msr change */

	wait_queue_head_t	tp_write_wait;

	struct ti_device	*tp_tdev;

	struct usb_serial_port	*tp_port;
@@ -432,7 +431,6 @@ static int ti_port_probe(struct usb_serial_port *port) 
	else

		tport->tp_uart_base_addr = TI_UART2_BASE_ADDR;

	tport->tp_closing_wait = closing_wait;

	init_waitqueue_head(&tport->tp_msr_wait);

	init_waitqueue_head(&tport->tp_write_wait);

	if (kfifo_alloc(&tport->write_fifo, TI_WRITE_BUF_SIZE, GFP_KERNEL)) {

		kfree(tport);
@@ -784,9 +782,13 @@ static int ti_ioctl(struct tty_struct *tty, 
		dev_dbg(&port->dev, "%s - TIOCMIWAIT\n", __func__);

		cprev = tport->tp_icount;

		while (1) {

			interruptible_sleep_on(&tport->tp_msr_wait);

			interruptible_sleep_on(&port->delta_msr_wait);

			if (signal_pending(current))

				return -ERESTARTSYS;



			if (port->serial->disconnected)

				return -EIO;



			cnow = tport->tp_icount;

			if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&

			    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
@@ -1392,7 +1394,7 @@ static void ti_handle_new_msr(struct ti_port *tport, __u8 msr) 
			icount->dcd++;

		if (msr & TI_MSR_DELTA_RI)

			icount->rng++;

		wake_up_interruptible(&tport->tp_msr_wait);

		wake_up_interruptible(&tport->tp_port->delta_msr_wait);

		spin_unlock_irqrestore(&tport->tp_lock, flags);

	}