[ 081/104] USB: garmin_gps: fix memory leak on disconnect
3.2-stable review patch. If anyone has any objections, please let me know.
--
From: Johan Hovold
commit 618aa1068df29c37a58045fe940f9106664153fd upstream.
Remove bogus disconnect test introduced by 95bef012e ("USB: more serial
drivers writing after disconnect") which prevented queued data from
being freed on disconnect.
The possible IO it was supposed to prevent is long gone.
Signed-off-by: Johan Hovold
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Ben Hutchings
---
drivers/usb/serial/garmin_gps.c |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -973,10 +973,7 @@ static void garmin_close(struct usb_seri
if (!serial)
return;
- mutex_lock(>serial->disc_mutex);
-
- if (!port->serial->disconnected)
- garmin_clear(garmin_data_p);
+ garmin_clear(garmin_data_p);
/* shutdown our urbs */
usb_kill_urb(port->read_urb);
@@ -985,8 +982,6 @@ static void garmin_close(struct usb_seri
/* keep reset state so we know that we must start a new session */
if (garmin_data_p->state != STATE_RESET)
garmin_data_p->state = STATE_DISCONNECTED;
-
- mutex_unlock(>serial->disc_mutex);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[ 081/104] USB: garmin_gps: fix memory leak on disconnect
3.2-stable review patch. If anyone has any objections, please let me know. -- From: Johan Hovold jhov...@gmail.com commit 618aa1068df29c37a58045fe940f9106664153fd upstream. Remove bogus disconnect test introduced by 95bef012e (USB: more serial drivers writing after disconnect) which prevented queued data from being freed on disconnect. The possible IO it was supposed to prevent is long gone. Signed-off-by: Johan Hovold jhov...@gmail.com Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org Signed-off-by: Ben Hutchings b...@decadent.org.uk --- drivers/usb/serial/garmin_gps.c |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -973,10 +973,7 @@ static void garmin_close(struct usb_seri if (!serial) return; - mutex_lock(port-serial-disc_mutex); - - if (!port-serial-disconnected) - garmin_clear(garmin_data_p); + garmin_clear(garmin_data_p); /* shutdown our urbs */ usb_kill_urb(port-read_urb); @@ -985,8 +982,6 @@ static void garmin_close(struct usb_seri /* keep reset state so we know that we must start a new session */ if (garmin_data_p-state != STATE_RESET) garmin_data_p-state = STATE_DISCONNECTED; - - mutex_unlock(port-serial-disc_mutex); } -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
