diff options
| author | Alexey Klimov <klimov.linux@gmail.com> | 2016-08-08 02:34:46 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-31 19:26:08 -0400 |
| commit | 8b0f82fcce12161ce459e5a0de455eb4ef39b416 (patch) | |
| tree | b1ac3f6bb5306b59ccccf57ca5ae9961057d2aad /drivers/usb | |
| parent | 52b29d10d54785738d998d7d308f6142dfbdf3ed (diff) | |
| download | lwn-8b0f82fcce12161ce459e5a0de455eb4ef39b416.tar.gz lwn-8b0f82fcce12161ce459e5a0de455eb4ef39b416.zip | |
USB: serial: fix memleak in driver-registration error path
[ Upstream commit 647024a7df36014bbc4479d92d88e6b77c0afcf6 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/usb')
| -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 6fbfc8fc2f5d..d3bf8348e638 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -1416,7 +1416,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; @@ -1434,6 +1434,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); |