linux-kernel - Re: [PATCH v2] media: uvcvideo: Fix custom control mapping probing

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <b5d17765-3d4e-416d-beb0-fd0752ef75ec@molgen.mpg.de>
Date: Mon, 22 Jul 2024 13:57:47 +0200
From: Paul Menzel <pmenzel@...gen.mpg.de>
To: Ricardo Ribalda <ribalda@...omium.org>
Cc: Laurent Pinchart <laurent.pinchart@...asonboard.com>,
 Mauro Carvalho Chehab <mchehab@...nel.org>,
 Sergey Senozhatsky <senozhatsky@...omium.org>, linux-media@...r.kernel.org,
 linux-kernel@...r.kernel.org, stable@...r.kernel.org
Subject: Re: [PATCH v2] media: uvcvideo: Fix custom control mapping probing

Dear Ricardo,


Thank you for sending v2.


Am 22.07.24 um 13:52 schrieb Ricardo Ribalda:
> Custom control mapping introduced a bug, where the filter function was
> applied to every single control.
> 
> Fix it so it is only applied to the matching controls.
> 
> The following dmesg errors during probe are now fixed:
> 
> usb 1-5: Found UVC 1.00 device Integrated_Webcam_HD (0c45:670c)
> usb 1-5: Failed to query (GET_CUR) UVC control 2 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 3 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 6 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 7 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 8 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 9 on unit 2: -75 (exp. 1).
> usb 1-5: Failed to query (GET_CUR) UVC control 10 on unit 2: -75 (exp. 1).
> 
> Reported-by: Paul Menzen <pmenzel@...gen.mpg.de>

Menze*l*

> Closes: https://lore.kernel.org/linux-media/518cd6b4-68a8-4895-b8fc-97d4dae1ddc4@molgen.mpg.de/T/#t
> Cc: stable@...r.kernel.org
> Fixes: 8f4362a8d42b ("media: uvcvideo: Allow custom control mapping")
> Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
> ---
> Paul, could you check if this fixes your issue, thanks!
> ---
> Changes in v2:
> - Replace !(A && B) with (!A || !B)
> - Add error message to commit message
> - Link to v1: https://lore.kernel.org/r/20240722-fix-filter-mapping-v1-1-07cc9c6bf4e3@chromium.org
> ---
>   drivers/media/usb/uvc/uvc_ctrl.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 0136df5732ba..4fe26e82e3d1 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -2680,6 +2680,10 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
>   	for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) {
>   		const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i];
>   
> +		if (!uvc_entity_match_guid(ctrl->entity, mapping->entity) ||
> +		    ctrl->info.selector != mapping->selector)
> +			continue;
> +
>   		/* Let the device provide a custom mapping. */
>   		if (mapping->filter_mapping) {
>   			mapping = mapping->filter_mapping(chain, ctrl);
> @@ -2687,9 +2691,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
>   				continue;
>   		}
>   
> -		if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
> -		    ctrl->info.selector == mapping->selector)
> -			__uvc_ctrl_add_mapping(chain, ctrl, mapping);
> +		__uvc_ctrl_add_mapping(chain, ctrl, mapping);
>   	}
>   }


Kind regards,

Paul