diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-25 10:29:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 10:02:59 -0700 |
| commit | 96e42e6acf74ad78cf9f37c2f2f2998ad7814929 (patch) | |
| tree | f508282a0aaea0fe5a978f5193e4ab6a5f678e16 | |
| parent | a58af76b5dbe701c2d194648c579690ac6c29efd (diff) | |
| download | kernel-common-96e42e6acf74ad78cf9f37c2f2f2998ad7814929.tar.gz kernel-common-96e42e6acf74ad78cf9f37c2f2f2998ad7814929.tar.bz2 kernel-common-96e42e6acf74ad78cf9f37c2f2f2998ad7814929.zip | |
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.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 0223ca77d2da..3942f12f2ef2 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -936,7 +936,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); @@ -973,6 +973,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) |