This is a note to let you know that I've just added the patch titled
USB: ssu100: 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-ssu100-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 43a66b4c417ad15f6d2f632ce67ad195bdf999e8 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@xxxxxxxxx>
Date: Tue, 19 Mar 2013 09:21:25 +0100
Subject: USB: ssu100: fix use-after-free in TIOCMIWAIT
From: Johan Hovold <jhovold@xxxxxxxxx>
commit 43a66b4c417ad15f6d2f632ce67ad195bdf999e8 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/ssu100.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -61,7 +61,6 @@ struct ssu100_port_private {
spinlock_t status_lock;
u8 shadowLSR;
u8 shadowMSR;
- wait_queue_head_t delta_msr_wait; /* Used for TIOCMIWAIT */
struct async_icount icount;
};
@@ -355,8 +354,9 @@ static int wait_modem_info(struct usb_se
spin_unlock_irqrestore(&priv->status_lock, flags);
while (1) {
- wait_event_interruptible(priv->delta_msr_wait,
- ((priv->icount.rng != prev.rng) ||
+ wait_event_interruptible(port->delta_msr_wait,
+ (port->serial->disconnected ||
+ (priv->icount.rng != prev.rng) ||
(priv->icount.dsr != prev.dsr) ||
(priv->icount.dcd != prev.dcd) ||
(priv->icount.cts != prev.cts)));
@@ -364,6 +364,9 @@ static int wait_modem_info(struct usb_se
if (signal_pending(current))
return -ERESTARTSYS;
+ if (port->serial->disconnected)
+ return -EIO;
+
spin_lock_irqsave(&priv->status_lock, flags);
cur = priv->icount;
spin_unlock_irqrestore(&priv->status_lock, flags);
@@ -445,7 +448,6 @@ static int ssu100_port_probe(struct usb_
return -ENOMEM;
spin_lock_init(&priv->status_lock);
- init_waitqueue_head(&priv->delta_msr_wait);
usb_set_serial_port_data(port, priv);
@@ -537,7 +539,7 @@ static void ssu100_update_msr(struct usb
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);
}
}
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