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>

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 0223ca7..3942f12 100644 (file)
--- 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)