aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/sierra.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-25 10:29:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-25 09:37:13 -0700
commit7e41f9bcdd2e813ea2a3c40db291d87ea06b559f (patch)
tree9bd76cc6dc0d9905d12f0e01dc31718ec8b63bb2 /drivers/usb/serial/sierra.c
parentb8f0e82044c9ba40e92340c8a6d47d6bd6d819bc (diff)
downloadlinux-stericsson-7e41f9bcdd2e813ea2a3c40db291d87ea06b559f.tar.gz
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/usb/serial/sierra.c')
-rw-r--r--drivers/usb/serial/sierra.c9
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)
dev_dbg(&port->dev, "%s: kmalloc for "
"sierra_port_private (%d) failed!\n",
__func__, i);
- return -ENOMEM;
+ goto err;
}
spin_lock_init(&portdata->lock);
init_usb_anchor(&portdata->active);
@@ -942,6 +942,13 @@ static int sierra_startup(struct usb_serial *serial)
}
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)