lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 129/171 ] USB: f81232: fix use-after-free in TIOCMIWAIT
    3.6.11.2 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    [ Upstream commit 508f940f1407656076a2e7d8f7fa059b567ecac2 ]

    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: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/usb/serial/f81232.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
    index be94436..441f09a 100644
    --- a/drivers/usb/serial/f81232.c
    +++ b/drivers/usb/serial/f81232.c
    @@ -49,7 +49,6 @@ MODULE_DEVICE_TABLE(usb, id_table);

    struct f81232_private {
    spinlock_t lock;
    - wait_queue_head_t delta_msr_wait;
    u8 line_control;
    u8 line_status;
    };
    @@ -114,7 +113,7 @@ static void f81232_process_read_urb(struct urb *urb)
    line_status = priv->line_status;
    priv->line_status &= ~UART_STATE_TRANSIENT_MASK;
    spin_unlock_irqrestore(&priv->lock, flags);
    - wake_up_interruptible(&priv->delta_msr_wait);
    + wake_up_interruptible(&port->delta_msr_wait);

    if (!urb->actual_length)
    return;
    @@ -262,11 +261,14 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
    spin_unlock_irqrestore(&priv->lock, flags);

    while (1) {
    - 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;
    +
    spin_lock_irqsave(&priv->lock, flags);
    status = priv->line_status;
    spin_unlock_irqrestore(&priv->lock, flags);
    @@ -328,7 +330,6 @@ static int f81232_port_probe(struct usb_serial_port *port)
    return -ENOMEM;

    spin_lock_init(&priv->lock);
    - init_waitqueue_head(&priv->delta_msr_wait);

    usb_set_serial_port_data(port, priv);

    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-04-12 00:01    [W:4.034 / U:1.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site