Commit 7e41f9bc authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: sierra: fix memory leak in attach error path

Make sure port private data is deallocated on errors in attach.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8f0e820
...@@ -905,7 +905,7 @@ static int sierra_startup(struct usb_serial *serial) ...@@ -905,7 +905,7 @@ static int sierra_startup(struct usb_serial *serial)
dev_dbg(&port->dev, "%s: kmalloc for " dev_dbg(&port->dev, "%s: kmalloc for "
"sierra_port_private (%d) failed!\n", "sierra_port_private (%d) failed!\n",
__func__, i); __func__, i);
return -ENOMEM; goto err;
} }
spin_lock_init(&portdata->lock); spin_lock_init(&portdata->lock);
init_usb_anchor(&portdata->active); init_usb_anchor(&portdata->active);
...@@ -942,6 +942,13 @@ static int sierra_startup(struct usb_serial *serial) ...@@ -942,6 +942,13 @@ static int sierra_startup(struct usb_serial *serial)
} }
return 0; return 0;
err:
for (--i; i >= 0; --i) {
portdata = usb_get_serial_port_data(serial->port[i]);
kfree(portdata);
}
return -ENOMEM;
} }
static void sierra_release(struct usb_serial *serial) static void sierra_release(struct usb_serial *serial)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment