| From 647024a7df36014bbc4479d92d88e6b77c0afcf6 Mon Sep 17 00:00:00 2001 |
| From: Alexey Klimov <klimov.linux@gmail.com> |
| Date: Mon, 8 Aug 2016 02:34:46 +0100 |
| Subject: USB: serial: fix memleak in driver-registration error path |
| |
| From: Alexey Klimov <klimov.linux@gmail.com> |
| |
| commit 647024a7df36014bbc4479d92d88e6b77c0afcf6 upstream. |
| |
| udriver struct allocated by kzalloc() will not be freed |
| if usb_register() and next calls fail. This patch fixes this |
| by adding one more step with kfree(udriver) in error path. |
| |
| Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> |
| Acked-by: Alan Stern <stern@rowland.harvard.edu> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/usb-serial.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/serial/usb-serial.c |
| +++ b/drivers/usb/serial/usb-serial.c |
| @@ -1426,7 +1426,7 @@ int usb_serial_register_drivers(struct u |
| |
| rc = usb_register(udriver); |
| if (rc) |
| - return rc; |
| + goto failed_usb_register; |
| |
| for (sd = serial_drivers; *sd; ++sd) { |
| (*sd)->usb_driver = udriver; |
| @@ -1444,6 +1444,8 @@ int usb_serial_register_drivers(struct u |
| while (sd-- > serial_drivers) |
| usb_serial_deregister(*sd); |
| usb_deregister(udriver); |
| +failed_usb_register: |
| + kfree(udriver); |
| return rc; |
| } |
| EXPORT_SYMBOL_GPL(usb_serial_register_drivers); |
