Skip to content

Commit

Permalink
usb: Fix qcserial memory leak on rmmod
Browse files Browse the repository at this point in the history
qcprobe function allocates serial->private but this is never freed, this
patch adds a new function qc_release() which frees serial->private, after
calling usb_wwan_release

Signed-off-by: Steven Hardy <shardy@redhat.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Steven Hardy authored and Greg Kroah-Hartman committed Apr 13, 2011
1 parent c53c2fa commit 10c9ab1
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion drivers/usb/serial/qcserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,18 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
return retval;
}

static void qc_release(struct usb_serial *serial)
{
struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);

dbg("%s", __func__);

/* Call usb_wwan release & free the private data allocated in qcprobe */
usb_wwan_release(serial);
usb_set_serial_data(serial, NULL);
kfree(priv);
}

static struct usb_serial_driver qcdevice = {
.driver = {
.owner = THIS_MODULE,
Expand All @@ -222,7 +234,7 @@ static struct usb_serial_driver qcdevice = {
.chars_in_buffer = usb_wwan_chars_in_buffer,
.attach = usb_wwan_startup,
.disconnect = usb_wwan_disconnect,
.release = usb_wwan_release,
.release = qc_release,
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,
Expand Down

0 comments on commit 10c9ab1

Please sign in to comment.