aboutsummaryrefslogtreecommitdiff
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-31 10:10:17 -0700
commitd9b48922b9d6dc1c02586d36639a27917f3dbe46 (patch)
tree9647b0ca0c2ef09706f4021b74a168e89cd292a6
parent9fd041e480fa2da73eab4d4bbba1f5738b45dc8f (diff)
downloadlinux-linaro-stable-d9b48922b9d6dc1c02586d36639a27917f3dbe46.tar.gz
USB: sierra: fix memory leak in attach error path
commit 7e41f9bcdd2e813ea2a3c40db291d87ea06b559f upstream. Make sure port private data is deallocated on errors in attach. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 15e639b045f7..b2f34a568e13 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -907,7 +907,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);
@@ -944,6 +944,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)