lkml.org 
[lkml]   [2013]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[088/251] USB: mos7840: fix memory leak in open
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Johan Hovold <jhovold@gmail.com>

    [ Upstream commit 5f8a2e68b679b41cc8e9b642f2f5aa45dd678641 ]

    Allocated urbs and buffers were never freed on errors in open.

    Cc: 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/mos7840.c | 25 +++++++++++++++++--------
    1 file changed, 17 insertions(+), 8 deletions(-)

    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index 3193d25..15cc47d 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -972,20 +972,20 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
    status = mos7840_get_reg_sync(port, mos7840_port->SpRegOffset, &Data);
    if (status < 0) {
    dbg("Reading Spreg failed");
    - return -1;
    + goto err;
    }
    Data |= 0x80;
    status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
    if (status < 0) {
    dbg("writing Spreg failed");
    - return -1;
    + goto err;
    }

    Data &= ~0x80;
    status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
    if (status < 0) {
    dbg("writing Spreg failed");
    - return -1;
    + goto err;
    }
    /* End of block to be checked */

    @@ -994,7 +994,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
    &Data);
    if (status < 0) {
    dbg("Reading Controlreg failed");
    - return -1;
    + goto err;
    }
    Data |= 0x08; /* Driver done bit */
    Data |= 0x20; /* rx_disable */
    @@ -1002,7 +1002,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
    mos7840_port->ControlRegOffset, Data);
    if (status < 0) {
    dbg("writing Controlreg failed");
    - return -1;
    + goto err;
    }
    /* do register settings here */
    /* Set all regs to the device default values. */
    @@ -1013,21 +1013,21 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
    status = mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
    if (status < 0) {
    dbg("disabling interrupts failed");
    - return -1;
    + goto err;
    }
    /* Set FIFO_CONTROL_REGISTER to the default value */
    Data = 0x00;
    status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
    if (status < 0) {
    dbg("Writing FIFO_CONTROL_REGISTER failed");
    - return -1;
    + goto err;
    }

    Data = 0xcf;
    status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
    if (status < 0) {
    dbg("Writing FIFO_CONTROL_REGISTER failed");
    - return -1;
    + goto err;
    }

    Data = 0x03;
    @@ -1181,6 +1181,15 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
    serial, mos7840_port, port);

    return 0;
    +err:
    + for (j = 0; j < NUM_URBS; ++j) {
    + urb = mos7840_port->write_urb_pool[j];
    + if (!urb)
    + continue;
    + kfree(urb->transfer_buffer);
    + usb_free_urb(urb);
    + }
    + return status;
    }

    /*****************************************************************************
    --
    1.7.10.4



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