This is a note to let you know that I've just added the patch titled
USB: sierra: fix memory leak in attach error path
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-sierra-fix-memory-leak-in-attach-error-path.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 7e41f9bcdd2e813ea2a3c40db291d87ea06b559f Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Thu, 25 Oct 2012 10:29:17 +0200
Subject: USB: sierra: fix memory leak in attach error path
From: Johan Hovold <[email protected]>
commit 7e41f9bcdd2e813ea2a3c40db291d87ea06b559f upstream.
Make sure port private data is deallocated on errors in attach.
Signed-off-by: Johan Hovold <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/serial/sierra.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -936,7 +936,7 @@ static int sierra_startup(struct usb_ser
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_ser
}
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)
Patches currently in stable-queue which might be from [email protected] are
queue-3.4/usb-opticon-fix-memory-leak-in-error-path.patch
queue-3.4/usb-mos7840-remove-null-urb-submission.patch
queue-3.4/usb-mos7840-remove-invalid-disconnect-handling.patch
queue-3.4/usb-whiteheat-fix-memory-leak-in-error-path.patch
queue-3.4/usb-mos7840-fix-port-device-leak-in-error-path.patch
queue-3.4/usb-mos7840-fix-urb-leak-at-release.patch
queue-3.4/usb-serial-fix-memory-leak-in-sierra_release.patch
queue-3.4/usb-opticon-fix-dma-from-stack.patch
queue-3.4/usb-sierra-fix-memory-leak-in-probe-error-path.patch
queue-3.4/usb-sierra-fix-memory-leak-in-attach-error-path.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
