This is a note to let you know that I've just added the patch titled
usb: use usb_serial_put in usb_serial_probe errors
to the 3.0-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-use-usb_serial_put-in-usb_serial_probe-errors.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 0658a3366db7e27fa32c12e886230bb58c414c92 Mon Sep 17 00:00:00 2001
From: Jan Safrata <[email protected]>
Date: Tue, 22 May 2012 14:04:50 +0200
Subject: usb: use usb_serial_put in usb_serial_probe errors
From: Jan Safrata <[email protected]>
commit 0658a3366db7e27fa32c12e886230bb58c414c92 upstream.
The use of kfree(serial) in error cases of usb_serial_probe
was invalid - usb_serial structure allocated in create_serial()
gets reference of usb_device that needs to be put, so we need
to use usb_serial_put() instead of simple kfree().
Signed-off-by: Jan Safrata <[email protected]>
Acked-by: Johan Hovold <[email protected]>
Cc: Richard Retanubun <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/serial/usb-serial.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -764,7 +764,7 @@ int usb_serial_probe(struct usb_interfac
if (retval) {
dbg("sub driver rejected device");
- kfree(serial);
+ usb_serial_put(serial);
module_put(type->driver.owner);
return retval;
}
@@ -836,7 +836,7 @@ int usb_serial_probe(struct usb_interfac
*/
if (num_bulk_in == 0 || num_bulk_out == 0) {
dev_info(&interface->dev, "PL-2303 hack: descriptors
matched but endpoints did not\n");
- kfree(serial);
+ usb_serial_put(serial);
module_put(type->driver.owner);
return -ENODEV;
}
@@ -850,7 +850,7 @@ int usb_serial_probe(struct usb_interfac
if (num_ports == 0) {
dev_err(&interface->dev,
"Generic device with no bulk out, not allowed.\n");
- kfree(serial);
+ usb_serial_put(serial);
module_put(type->driver.owner);
return -EIO;
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.0/usb-use-usb_serial_put-in-usb_serial_probe-errors.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
