Skip to content

Commit

Permalink
USB: serial: fix memleak in driver-registration error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
trashsee authored and jhovold committed Aug 8, 2016
1 parent 01d7956 commit 647024a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 647024a

Please sign in to comment.