[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 7 Aug 2016 21:41:37 -0400 (EDT)
From: Alan Stern <stern@...land.harvard.edu>
To: Alexey Klimov <klimov.linux@...il.com>
cc: linux-usb@...r.kernel.org, <johan@...nel.org>,
<gregkh@...uxfoundation.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] USB: serial: fix memleak on error path in usb-serial
On Mon, 8 Aug 2016, Alexey Klimov wrote:
> 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.
>
> Cc: Alan Stern <stern@...land.harvard.edu>
> Signed-off-by: Alexey Klimov <klimov.linux@...il.com>
> ---
> drivers/usb/serial/usb-serial.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
> index b1b9bac..d213cf4 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);
Acked-by: Alan Stern <stern@...land.harvard.edu>
Pretty careless of me... Thanks for fixing this.
Alan Stern
Powered by blists - more mailing lists