diff options
| author |   Alexey Klimov <klimov.linux@gmail.com> | 2016-08-08 02:34:46 +0100 |
|---|---|---|
| committer |   Johan Hovold <johan@kernel.org> | 2016-08-08 13:41:17 +0200 |
| commit | 647024a7df36014bbc4479d92d88e6b77c0afcf6 (patch) | |
| tree | 62e8a15ea2e8180743bb43af45aedb0f6ed19693 /drivers/usb/serial/usb-serial.c | |
| parent | USB: serial: option: add support for Telit LE920A4 (diff) | |
| download | linux-dev-647024a7df36014bbc4479d92d88e6b77c0afcf6.tar.xz linux-dev-647024a7df36014bbc4479d92d88e6b77c0afcf6.zip | |
USB: serial: fix memleak in driver-registration error path
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index b1b9bac44016..d213cf44a7e4 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -1433,7 +1433,7 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] rc = usb_register(udriver); if (rc) - return rc; + goto failed_usb_register; for (sd = serial_drivers; *sd; ++sd) { (*sd)->usb_driver = udriver; @@ -1451,6 +1451,8 @@ int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[] 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); |