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

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

USB: ark3116: 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 e5b33dc9

drivers/usb/serial/ark3116.c

+6 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static int is_irda(struct usb_serial *serial) 
}



struct ark3116_private {

	wait_queue_head_t       delta_msr_wait;

	struct async_icount	icount;

	int			irda;	/* 1 for irda device */
@@ -146,7 +145,6 @@ static int ark3116_port_probe(struct usb_serial_port *port) 
	if (!priv)

		return -ENOMEM;



	init_waitqueue_head(&priv->delta_msr_wait);

	mutex_init(&priv->hw_lock);

	spin_lock_init(&priv->status_lock);
@@ -456,10 +454,14 @@ static int ark3116_ioctl(struct tty_struct *tty, 
	case TIOCMIWAIT:

		for (;;) {

			struct async_icount prev = priv->icount;

			interruptible_sleep_on(&priv->delta_msr_wait);

			interruptible_sleep_on(&port->delta_msr_wait);

			/* see if a signal did it */

			if (signal_pending(current))

				return -ERESTARTSYS;



			if (port->serial->disconnected)

				return -EIO;



			if ((prev.rng == priv->icount.rng) &&

			    (prev.dsr == priv->icount.dsr) &&

			    (prev.dcd == priv->icount.dcd) &&
@@ -580,7 +582,7 @@ static void ark3116_update_msr(struct usb_serial_port *port, __u8 msr) 
			priv->icount.dcd++;

		if (msr & UART_MSR_TERI)

			priv->icount.rng++;

		wake_up_interruptible(&priv->delta_msr_wait);

		wake_up_interruptible(&port->delta_msr_wait);

	}

}