leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: sierra: fix memory leak in probe error path

Browse Source 
Move interface data allocation to attach so that it is deallocated on
errors in usb-serial probe.

Cc: <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2012-10-25 10:29:18 +02:00 committed by Greg Kroah-Hartman
parent 7e41f9bcdd
commit 084817d793
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/serial/sierra.c
View File

@ -161,7 +161,6 @@ static int sierra_probe(struct usb_serial *serial,
{ {
int result = 0; int result = 0;
struct usb_device *udev; struct usb_device *udev;
struct sierra_intf_private *data;
u8 ifnum; u8 ifnum;
udev = serial->dev; udev = serial->dev;
@ -188,11 +187,6 @@ static int sierra_probe(struct usb_serial *serial,
return -ENODEV; return -ENODEV;
} }
data = serial->private = kzalloc(sizeof(struct sierra_intf_private), GFP_KERNEL);
if (!data)
return -ENOMEM;
spin_lock_init(&data->susp_lock);
return result; return result;
} }
@ -885,11 +879,20 @@ static void sierra_dtr_rts(struct usb_serial_port *port, int on)
static int sierra_startup(struct usb_serial *serial) static int sierra_startup(struct usb_serial *serial)
{ {
struct usb_serial_port *port; struct usb_serial_port *port;
struct sierra_intf_private *intfdata;
struct sierra_port_private *portdata; struct sierra_port_private *portdata;
struct sierra_iface_info *himemoryp = NULL; struct sierra_iface_info *himemoryp = NULL;
int i; int i;
u8 ifnum; u8 ifnum;
intfdata = kzalloc(sizeof(*intfdata), GFP_KERNEL);
if (!intfdata)
return -ENOMEM;
spin_lock_init(&intfdata->susp_lock);
usb_set_serial_data(serial, intfdata);
/* Set Device mode to D0 */ /* Set Device mode to D0 */
sierra_set_power_state(serial->dev, 0x0000); sierra_set_power_state(serial->dev, 0x0000);
@ -947,6 +950,7 @@ err:
portdata = usb_get_serial_port_data(serial->port[i]); portdata = usb_get_serial_port_data(serial->port[i]);
kfree(portdata); kfree(portdata);
} }
kfree(intfdata);
return -ENOMEM; return -ENOMEM;
} }