diff options
author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 04:29:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 12:37:13 -0400 |
commit | 7e41f9bcdd2e813ea2a3c40db291d87ea06b559f (patch) | |
tree | 9bd76cc6dc0d9905d12f0e01dc31718ec8b63bb2 /drivers | |
parent | b8f0e82044c9ba40e92340c8a6d47d6bd6d819bc (diff) |
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/sierra.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 76ef95bcbbf2..2cb27e49d4ac 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -905,7 +905,7 @@ static int sierra_startup(struct usb_serial *serial) | |||
905 | dev_dbg(&port->dev, "%s: kmalloc for " | 905 | dev_dbg(&port->dev, "%s: kmalloc for " |
906 | "sierra_port_private (%d) failed!\n", | 906 | "sierra_port_private (%d) failed!\n", |
907 | __func__, i); | 907 | __func__, i); |
908 | return -ENOMEM; | 908 | goto err; |
909 | } | 909 | } |
910 | spin_lock_init(&portdata->lock); | 910 | spin_lock_init(&portdata->lock); |
911 | init_usb_anchor(&portdata->active); | 911 | init_usb_anchor(&portdata->active); |
@@ -942,6 +942,13 @@ static int sierra_startup(struct usb_serial *serial) | |||
942 | } | 942 | } |
943 | 943 | ||
944 | return 0; | 944 | return 0; |
945 | err: | ||
946 | for (--i; i >= 0; --i) { | ||
947 | portdata = usb_get_serial_port_data(serial->port[i]); | ||
948 | kfree(portdata); | ||
949 | } | ||
950 | |||
951 | return -ENOMEM; | ||
945 | } | 952 | } |
946 | 953 | ||
947 | static void sierra_release(struct usb_serial *serial) | 954 | static void sierra_release(struct usb_serial *serial) |