lkml.org 
[lkml]   [2016]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 26/56] USB: serial: io_edgeport: fix memory leaks in probe error path
    Date
    From: Johan Hovold <johan@kernel.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit c8d62957d450cc1a22ce3242908709fe367ddc8e upstream.

    URBs and buffers allocated in attach for Epic devices would never be
    deallocated in case of a later probe error (e.g. failure to allocate
    minor numbers) as disconnect is then never called.

    Fix by moving deallocation to release and making sure that the
    URBs are first unlinked.

    Fixes: f9c99bb8b3a1 ("USB: usb-serial: replace shutdown with disconnect,
    release")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/serial/io_edgeport.c | 17 ++++++++++-------
    1 file changed, 10 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
    index 60bff3b75609..0d037cc40e51 100644
    --- a/drivers/usb/serial/io_edgeport.c
    +++ b/drivers/usb/serial/io_edgeport.c
    @@ -2989,16 +2989,9 @@ static void edge_disconnect(struct usb_serial *serial)
    {
    struct edgeport_serial *edge_serial = usb_get_serial_data(serial);

    - /* stop reads and writes on all ports */
    - /* free up our endpoint stuff */
    if (edge_serial->is_epic) {
    usb_kill_urb(edge_serial->interrupt_read_urb);
    - usb_free_urb(edge_serial->interrupt_read_urb);
    - kfree(edge_serial->interrupt_in_buffer);
    -
    usb_kill_urb(edge_serial->read_urb);
    - usb_free_urb(edge_serial->read_urb);
    - kfree(edge_serial->bulk_in_buffer);
    }
    }

    @@ -3011,6 +3004,16 @@ static void edge_release(struct usb_serial *serial)
    {
    struct edgeport_serial *edge_serial = usb_get_serial_data(serial);

    + if (edge_serial->is_epic) {
    + usb_kill_urb(edge_serial->interrupt_read_urb);
    + usb_free_urb(edge_serial->interrupt_read_urb);
    + kfree(edge_serial->interrupt_in_buffer);
    +
    + usb_kill_urb(edge_serial->read_urb);
    + usb_free_urb(edge_serial->read_urb);
    + kfree(edge_serial->bulk_in_buffer);
    + }
    +
    kfree(edge_serial);
    }

    --
    2.9.0
    \
     
     \ /
      Last update: 2016-06-15 10:21    [W:2.362 / U:1.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site