Patch "USB: io_edgeport: fix use-after-free in TIOCMIWAIT" has been added to the 3.8-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

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

to the 3.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-io_edgeport-fix-use-after-free-in-tiocmiwait.patch
and it can be found in the queue-3.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 333576255d4cfc53efd056aad438568184b36af6 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Tue, 19 Mar 2013 09:21:16 +0100
Subject: USB: io_edgeport: fix use-after-free in TIOCMIWAIT

From: Johan Hovold <jhovold@xxxxxxxxx>

commit 333576255d4cfc53efd056aad438568184b36af6 upstream.

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.

Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
 drivers/usb/serial/io_edgeport.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -110,7 +110,6 @@ struct edgeport_port {
 	wait_queue_head_t	wait_chase;		/* for handling sleeping while waiting for chase to finish */
 	wait_queue_head_t	wait_open;		/* for handling sleeping while waiting for open to finish */
 	wait_queue_head_t	wait_command;		/* for handling sleeping while waiting for command to finish */
-	wait_queue_head_t	delta_msr_wait;		/* for handling sleeping while waiting for msr change to happen */
 
 	struct async_icount	icount;
 	struct usb_serial_port	*port;			/* loop back to the owner of this object */
@@ -884,7 +883,6 @@ static int edge_open(struct tty_struct *
 	/* initialize our wait queues */
 	init_waitqueue_head(&edge_port->wait_open);
 	init_waitqueue_head(&edge_port->wait_chase);
-	init_waitqueue_head(&edge_port->delta_msr_wait);
 	init_waitqueue_head(&edge_port->wait_command);
 
 	/* initialize our icount structure */
@@ -1669,13 +1667,17 @@ static int edge_ioctl(struct tty_struct
 		dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__,  port->number);
 		cprev = edge_port->icount;
 		while (1) {
-			prepare_to_wait(&edge_port->delta_msr_wait,
+			prepare_to_wait(&port->delta_msr_wait,
 						&wait, TASK_INTERRUPTIBLE);
 			schedule();
-			finish_wait(&edge_port->delta_msr_wait, &wait);
+			finish_wait(&port->delta_msr_wait, &wait);
 			/* see if a signal did it */
 			if (signal_pending(current))
 				return -ERESTARTSYS;
+
+			if (port->serial->disconnected)
+				return -EIO;
+
 			cnow = edge_port->icount;
 			if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
 			    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
@@ -2055,7 +2057,7 @@ static void handle_new_msr(struct edgepo
 			icount->dcd++;
 		if (newMsr & EDGEPORT_MSR_DELTA_RI)
 			icount->rng++;
-		wake_up_interruptible(&edge_port->delta_msr_wait);
+		wake_up_interruptible(&edge_port->port->delta_msr_wait);
 	}
 
 	/* Save the new modem status */


Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are

queue-3.8/usb-quatech2-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ark3116-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-cypress_m8-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-pl2303-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-io_edgeport-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ch341-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mos7840-fix-broken-tiocmiwait.patch
queue-3.8/usb-spcp8x5-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ti_usb_3410_5052-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-serial-fix-hang-when-opening-port.patch
queue-3.8/usb-f81232-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mct_u232-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-oti6858-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ftdi_sio-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-serial-add-modem-status-change-wait-queue.patch
queue-3.8/usb-io_ti-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-ssu100-fix-use-after-free-in-tiocmiwait.patch
queue-3.8/usb-mos7840-fix-use-after-free-in-tiocmiwait.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]