From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 25 Oct 2012 08:29:17 +0000 (+0200)
Subject: USB: sierra: fix memory leak in attach error path
X-Git-Tag: v2.6.39-400.9.0~161
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1df3b7aa227f1750f3fcfc7f94f16c20c9a91199;p=users%2Fjedix%2Flinux-maple.git

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>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ca0637600610..a8e10269b5f2 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -937,7 +937,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);
@@ -974,6 +974,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)