linux-kernel - Re: [PATCH 2/2] media: uvc: Undup use uvv-endpoint_max

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 25 Apr 2022 01:31:12 +0300
From:   Laurent Pinchart <laurent.pinchart@...asonboard.com>
To:     Ricardo Ribalda <ribalda@...omium.org>
Cc:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] media: uvc: Undup use uvv-endpoint_max_bpi code

Hi Ricardo,

Thank you for the patch.

And here the subject line should mention uvc_endpoint_max_bpi() :-)
While at it, I'll replace "uvc" with "uvcvideo".

On Fri, Apr 01, 2022 at 07:24:37PM +0200, Ricardo Ribalda wrote:
> Replace manual decoding of psize in uvc_parse_streaming(), with the code
> from uvc_endpoint_max_bpi(). It also handles usb3 devices.

Reviewed-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>

> Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
> ---
>  drivers/media/usb/uvc/uvc_driver.c | 4 +---
>  drivers/media/usb/uvc/uvc_video.c  | 3 +--
>  drivers/media/usb/uvc/uvcvideo.h   | 1 +
>  3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index dda0f0aa78b8..977566aa2c89 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1009,9 +1009,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
>  				streaming->header.bEndpointAddress);
>  		if (ep == NULL)
>  			continue;
> -
> -		psize = le16_to_cpu(ep->desc.wMaxPacketSize);
> -		psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
> +		psize = uvc_endpoint_max_bpi(dev->udev, ep);
>  		if (psize > streaming->maxpsize)
>  			streaming->maxpsize = psize;
>  	}
> diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
> index a2dcfeaaac1b..9dc0a5dba158 100644
> --- a/drivers/media/usb/uvc/uvc_video.c
> +++ b/drivers/media/usb/uvc/uvc_video.c
> @@ -1756,8 +1756,7 @@ static void uvc_video_stop_transfer(struct uvc_streaming *stream,
>  /*
>   * Compute the maximum number of bytes per interval for an endpoint.
>   */
> -static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev,
> -					 struct usb_host_endpoint *ep)
> +u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep)
>  {
>  	u16 psize;
>  
> diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> index 143230b3275b..28eb337a6cfb 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -911,6 +911,7 @@ void uvc_simplify_fraction(u32 *numerator, u32 *denominator,
>  u32 uvc_fraction_to_interval(u32 numerator, u32 denominator);
>  struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,
>  					    u8 epaddr);
> +u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep);
>  
>  /* Quirks support */
>  void uvc_video_decode_isight(struct uvc_urb *uvc_urb,

-- 
Regards,

Laurent Pinchart