[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CANiDSCs_Pz-wgnYNVA7Zt4RhtgN256i32aCw0mE4XFv3b49ygw@mail.gmail.com>
Date: Tue, 1 Jul 2025 18:48:20 +0200
From: Ricardo Ribalda <ribalda@...omium.org>
To: Desnes Nunes <desnesn@...hat.com>
Cc: laurent.pinchart@...asonboard.com, hansg@...nel.org,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
Hi Desnes
On Tue, 1 Jul 2025 at 16:59, Desnes Nunes <desnesn@...hat.com> wrote:
>
> This avoids a variable loop shadowing occurring between the local loop
> iterating through the uvc_entity's controls and the global one going
> through the pending async controls of the file handle
>
> Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
If you add a fixes you need to add
Cc: stable@...nel.org
Reviewed-by: Ricardo Ribalda <ribalda@...omium.org>
> Signed-off-by: Desnes Nunes <desnesn@...hat.com>
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 44b6513c5264..91cc874da798 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -3260,7 +3260,6 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
> void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> {
> struct uvc_entity *entity;
> - int i;
>
> guard(mutex)(&handle->chain->ctrl_mutex);
>
> @@ -3278,7 +3277,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> if (!WARN_ON(handle->pending_async_ctrls))
> return;
>
> - for (i = 0; i < handle->pending_async_ctrls; i++)
nitpick: I would have called the variable i, not j. For me j usually
means nested loop. But up to you
I am also not against your first version with a different commit message.
Thanks!
> + for (unsigned int j = 0; j < handle->pending_async_ctrls; j++)
> uvc_pm_put(handle->stream->dev);
> }
>
> --
> 2.49.0
>
>
--
Ricardo Ribalda
Powered by blists - more mailing lists