[ 085/104] USB: ark3116: fix use-after-free in TIOCMIWAIT
3.2-stable review patch. If anyone has any objections, please let me know.
--
From: Johan Hovold
commit 5018860321dc7a9e50a75d5f319bc981298fb5b7 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
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Ben Hutchings
---
drivers/usb/serial/ark3116.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -68,7 +68,6 @@ static int is_irda(struct usb_serial *se
}
struct ark3116_private {
- wait_queue_head_t delta_msr_wait;
struct async_icount icount;
int irda; /* 1 for irda device */
@@ -148,7 +147,6 @@ static int ark3116_attach(struct usb_ser
if (!priv)
return -ENOMEM;
- init_waitqueue_head(>delta_msr_wait);
mutex_init(>hw_lock);
spin_lock_init(>status_lock);
@@ -460,10 +458,14 @@ static int ark3116_ioctl(struct tty_stru
case TIOCMIWAIT:
for (;;) {
struct async_icount prev = priv->icount;
- interruptible_sleep_on(>delta_msr_wait);
+ interruptible_sleep_on(>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) &&
@@ -584,7 +586,7 @@ static void ark3116_update_msr(struct us
priv->icount.dcd++;
if (msr & UART_MSR_TERI)
priv->icount.rng++;
- wake_up_interruptible(>delta_msr_wait);
+ wake_up_interruptible(>delta_msr_wait);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[ 085/104] USB: ark3116: fix use-after-free in TIOCMIWAIT
3.2-stable review patch. If anyone has any objections, please let me know.
--
From: Johan Hovold jhov...@gmail.com
commit 5018860321dc7a9e50a75d5f319bc981298fb5b7 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 jhov...@gmail.com
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
drivers/usb/serial/ark3116.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -68,7 +68,6 @@ static int is_irda(struct usb_serial *se
}
struct ark3116_private {
- wait_queue_head_t delta_msr_wait;
struct async_icount icount;
int irda; /* 1 for irda device */
@@ -148,7 +147,6 @@ static int ark3116_attach(struct usb_ser
if (!priv)
return -ENOMEM;
- init_waitqueue_head(priv-delta_msr_wait);
mutex_init(priv-hw_lock);
spin_lock_init(priv-status_lock);
@@ -460,10 +458,14 @@ static int ark3116_ioctl(struct tty_stru
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)
@@ -584,7 +586,7 @@ static void ark3116_update_msr(struct us
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);
}
}
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
