lkml.org 
[lkml]   [2010]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] qcserial: fix a memory leak in qcprobe error path
From
Date
In current implemtation, the "data" is not kfreed in qcprobe error path.
This patch moves the memory allocation a little bit latter and only
allocate memory when no error is detected in previous checking.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/usb/serial/qcserial.c | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 04bb759..d30078c 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -109,13 +109,6 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
ifnum = intf->desc.bInterfaceNumber;
dbg("This Interface = %d", ifnum);

- data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private),
- GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
- spin_lock_init(&data->susp_lock);
-
switch (nintf) {
case 1:
/* QDL mode */
@@ -130,8 +123,10 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
dbg("QDL port found");

- if (serial->interface->num_altsetting == 1)
- return 0;
+ if (serial->interface->num_altsetting == 1) {
+ retval = 0;
+ goto out;
+ }

retval = usb_set_interface(serial->dev, ifnum, 1);
if (retval < 0) {
@@ -140,7 +135,7 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
retval);
retval = -ENODEV;
}
- return retval;
+ goto out;
}
break;

@@ -156,17 +151,26 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
retval);
retval = -ENODEV;
}
- return retval;
+ goto out;
}
break;

default:
dev_err(&serial->dev->dev,
"unknown number of interfaces: %d\n", nintf);
- return -ENODEV;
}

- return retval;
+out:
+ if (retval)
+ return retval;
+
+ data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private),
+ GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ spin_lock_init(&data->susp_lock);
+ return 0;
}

static struct usb_serial_driver qcdevice = {
--
1.5.4.3




\
 
 \ /
  Last update: 2010-06-08 09:31    [W:0.044 / U:1.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site