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[ 125/171 ] USB: spcp8x5: 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 dbcea7615d8d7d58f6ff49d2c5568113f70effe9 ]

    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/spcp8x5.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
    index 2451c08..0822a10 100644
    --- a/drivers/usb/serial/spcp8x5.c
    +++ b/drivers/usb/serial/spcp8x5.c
    @@ -154,7 +154,6 @@ enum spcp8x5_type {
    struct spcp8x5_private {
    spinlock_t lock;
    enum spcp8x5_type type;
    - wait_queue_head_t delta_msr_wait;
    u8 line_control;
    u8 line_status;
    };
    @@ -184,7 +183,6 @@ static int spcp8x5_port_probe(struct usb_serial_port *port)
    return -ENOMEM;

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

    usb_set_serial_port_data(port , priv);
    @@ -481,7 +479,7 @@ static void spcp8x5_process_read_urb(struct urb *urb)
    priv->line_status &= ~UART_STATE_TRANSIENT_MASK;
    spin_unlock_irqrestore(&priv->lock, flags);
    /* wake up the wait for termios */
    - wake_up_interruptible(&priv->delta_msr_wait);
    + wake_up_interruptible(&port->delta_msr_wait);

    if (!urb->actual_length)
    return;
    @@ -531,12 +529,15 @@ static int spcp8x5_wait_modem_info(struct usb_serial_port *port,

    while (1) {
    /* wake up in bulk read */
    - 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);
    --
    1.7.10.4



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