Hi Andrzej,
Thank you for the patch.
On Friday 28 February 2014 10:32:23 Andrzej Pietrasiewicz wrote:
> If uvc->control_buf is successfuly allocated but uvc->control_req
> is not, uvc->control_buf is not freed in the error recovery path.
> With this patch applied uvc->control_buf is freed unconditionally;
> if it happens to be NULL kfree on it is safe anyway.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
and applied to my tree. I'll push it to v3.17.
> ---
> drivers/usb/gadget/f_uvc.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
> index e2a1f50..ff4340a 100644
> --- a/drivers/usb/gadget/f_uvc.c
> +++ b/drivers/usb/gadget/f_uvc.c
> @@ -720,10 +720,9 @@ error:
> if (uvc->video.ep)
> uvc->video.ep->driver_data = NULL;
>
> - if (uvc->control_req) {
> + if (uvc->control_req)
> usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
> - kfree(uvc->control_buf);
> - }
> + kfree(uvc->control_buf);
>
> usb_free_all_descriptors(f);
> return ret;
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
