* [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
@ 2025-07-01 17:25 Desnes Nunes
2025-07-01 19:05 ` Ricardo Ribalda
2025-07-07 12:43 ` Hans de Goede
0 siblings, 2 replies; 6+ messages in thread
From: Desnes Nunes @ 2025-07-01 17:25 UTC (permalink / raw)
To: laurent.pinchart, hansg; +Cc: linux-media, linux-kernel, Desnes Nunes, stable
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
Cc: stable@kernel.org
Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
Signed-off-by: Desnes Nunes <desnesn@redhat.com>
---
drivers/media/usb/uvc/uvc_ctrl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 44b6513c5264..532615d8484b 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -3260,7 +3260,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
{
struct uvc_entity *entity;
- int i;
+ unsigned int i;
guard(mutex)(&handle->chain->ctrl_mutex);
@@ -3268,7 +3268,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
return;
list_for_each_entry(entity, &handle->chain->dev->entities, list) {
- for (unsigned int i = 0; i < entity->ncontrols; ++i) {
+ for (i = 0; i < entity->ncontrols; ++i) {
if (entity->controls[i].handle != handle)
continue;
uvc_ctrl_set_handle(handle, &entity->controls[i], NULL);
--
2.49.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
2025-07-01 17:25 [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh Desnes Nunes
@ 2025-07-01 19:05 ` Ricardo Ribalda
2025-07-07 12:43 ` Hans de Goede
1 sibling, 0 replies; 6+ messages in thread
From: Ricardo Ribalda @ 2025-07-01 19:05 UTC (permalink / raw)
To: Desnes Nunes; +Cc: laurent.pinchart, hansg, linux-media, linux-kernel, stable
On Tue, 1 Jul 2025 at 19:27, Desnes Nunes <desnesn@redhat.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
>
> Cc: stable@kernel.org
> Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 44b6513c5264..532615d8484b 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -3260,7 +3260,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
> void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> {
> struct uvc_entity *entity;
> - int i;
> + unsigned int i;
>
> guard(mutex)(&handle->chain->ctrl_mutex);
>
> @@ -3268,7 +3268,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> return;
>
> list_for_each_entry(entity, &handle->chain->dev->entities, list) {
> - for (unsigned int i = 0; i < entity->ncontrols; ++i) {
> + for (i = 0; i < entity->ncontrols; ++i) {
> if (entity->controls[i].handle != handle)
> continue;
> uvc_ctrl_set_handle(handle, &entity->controls[i], NULL);
> --
> 2.49.0
>
>
--
Ricardo Ribalda
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
2025-07-01 17:25 [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh Desnes Nunes
2025-07-01 19:05 ` Ricardo Ribalda
@ 2025-07-07 12:43 ` Hans de Goede
2025-07-07 12:50 ` Laurent Pinchart
1 sibling, 1 reply; 6+ messages in thread
From: Hans de Goede @ 2025-07-07 12:43 UTC (permalink / raw)
To: Desnes Nunes, laurent.pinchart; +Cc: linux-media, linux-kernel, stable
Hi,
On 1-Jul-25 19:25, Desnes Nunes 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
>
> Cc: stable@kernel.org
> Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
Thank you for the new version.
I've pushed this to uvc/for-next now:
https://gitlab.freedesktop.org/linux-media/users/uvc/-/commits/for-next/
Note I had to manually apply the patch because of it conflicting with:
https://gitlab.freedesktop.org/linux-media/users/uvc/-/commit/2b1e8e9f7bb30204ddb42887c4e554c131f003c9
So if you want this backported to stable you will need to send
the original version to stable your self.
I plan to send a pull-request with the changes from for-next this Thursday.
Regards,
Hans
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 44b6513c5264..532615d8484b 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -3260,7 +3260,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
> void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> {
> struct uvc_entity *entity;
> - int i;
> + unsigned int i;
>
> guard(mutex)(&handle->chain->ctrl_mutex);
>
> @@ -3268,7 +3268,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> return;
>
> list_for_each_entry(entity, &handle->chain->dev->entities, list) {
> - for (unsigned int i = 0; i < entity->ncontrols; ++i) {
> + for (i = 0; i < entity->ncontrols; ++i) {
> if (entity->controls[i].handle != handle)
> continue;
> uvc_ctrl_set_handle(handle, &entity->controls[i], NULL);
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
2025-07-07 12:43 ` Hans de Goede
@ 2025-07-07 12:50 ` Laurent Pinchart
2025-07-07 13:01 ` Hans de Goede
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2025-07-07 12:50 UTC (permalink / raw)
To: Hans de Goede; +Cc: Desnes Nunes, linux-media, linux-kernel, stable
Hi Hans,
On Mon, Jul 07, 2025 at 02:43:09PM +0200, Hans de Goede wrote:
> On 1-Jul-25 19:25, Desnes Nunes 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
> >
> > Cc: stable@kernel.org
> > Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
> > Signed-off-by: Desnes Nunes <desnesn@redhat.com>
>
> Thank you for the new version.
>
> I've pushed this to uvc/for-next now:
>
> https://gitlab.freedesktop.org/linux-media/users/uvc/-/commits/for-next/
As mentioned during the review (see
20250701192928.GB16835@pendragon.ideasonboard.com), I still prefer local
loop variables. Can we use that please ?
> Note I had to manually apply the patch because of it conflicting with:
>
> https://gitlab.freedesktop.org/linux-media/users/uvc/-/commit/2b1e8e9f7bb30204ddb42887c4e554c131f003c9
>
> So if you want this backported to stable you will need to send
> the original version to stable your self.
>
> I plan to send a pull-request with the changes from for-next this Thursday.
>
> > ---
> > drivers/media/usb/uvc/uvc_ctrl.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> > index 44b6513c5264..532615d8484b 100644
> > --- a/drivers/media/usb/uvc/uvc_ctrl.c
> > +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> > @@ -3260,7 +3260,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
> > void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> > {
> > struct uvc_entity *entity;
> > - int i;
> > + unsigned int i;
> >
> > guard(mutex)(&handle->chain->ctrl_mutex);
> >
> > @@ -3268,7 +3268,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
> > return;
> >
> > list_for_each_entry(entity, &handle->chain->dev->entities, list) {
> > - for (unsigned int i = 0; i < entity->ncontrols; ++i) {
> > + for (i = 0; i < entity->ncontrols; ++i) {
> > if (entity->controls[i].handle != handle)
> > continue;
> > uvc_ctrl_set_handle(handle, &entity->controls[i], NULL);
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
2025-07-07 12:50 ` Laurent Pinchart
@ 2025-07-07 13:01 ` Hans de Goede
2025-07-08 12:40 ` Desnes Nunes
0 siblings, 1 reply; 6+ messages in thread
From: Hans de Goede @ 2025-07-07 13:01 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: Desnes Nunes, linux-media, linux-kernel, stable
Hi,
On 7-Jul-25 14:50, Laurent Pinchart wrote:
> Hi Hans,
>
> On Mon, Jul 07, 2025 at 02:43:09PM +0200, Hans de Goede wrote:
>> On 1-Jul-25 19:25, Desnes Nunes 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
>>>
>>> Cc: stable@kernel.org
>>> Fixes: 10acb9101355 ("media: uvcvideo: Increase/decrease the PM counter per IOCTL")
>>> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
>>
>> Thank you for the new version.
>>
>> I've pushed this to uvc/for-next now:
>>
>> https://gitlab.freedesktop.org/linux-media/users/uvc/-/commits/for-next/
>
> As mentioned during the review (see
> 20250701192928.GB16835@pendragon.ideasonboard.com), I still prefer local
> loop variables. Can we use that please ?
Ok, I'll drop this from for-next.
Desnes, can you prepare a v3 moving the toplevel declation
inside the other loop please ?
Regards,
Hans
>> Note I had to manually apply the patch because of it conflicting with:
>>
>> https://gitlab.freedesktop.org/linux-media/users/uvc/-/commit/2b1e8e9f7bb30204ddb42887c4e554c131f003c9
>>
>> So if you want this backported to stable you will need to send
>> the original version to stable your self.
>>
>> I plan to send a pull-request with the changes from for-next this Thursday.
>>
>>> ---
>>> drivers/media/usb/uvc/uvc_ctrl.c | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
>>> index 44b6513c5264..532615d8484b 100644
>>> --- a/drivers/media/usb/uvc/uvc_ctrl.c
>>> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
>>> @@ -3260,7 +3260,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
>>> void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
>>> {
>>> struct uvc_entity *entity;
>>> - int i;
>>> + unsigned int i;
>>>
>>> guard(mutex)(&handle->chain->ctrl_mutex);
>>>
>>> @@ -3268,7 +3268,7 @@ void uvc_ctrl_cleanup_fh(struct uvc_fh *handle)
>>> return;
>>>
>>> list_for_each_entry(entity, &handle->chain->dev->entities, list) {
>>> - for (unsigned int i = 0; i < entity->ncontrols; ++i) {
>>> + for (i = 0; i < entity->ncontrols; ++i) {
>>> if (entity->controls[i].handle != handle)
>>> continue;
>>> uvc_ctrl_set_handle(handle, &entity->controls[i], NULL);
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh
2025-07-07 13:01 ` Hans de Goede
@ 2025-07-08 12:40 ` Desnes Nunes
0 siblings, 0 replies; 6+ messages in thread
From: Desnes Nunes @ 2025-07-08 12:40 UTC (permalink / raw)
To: Hans de Goede; +Cc: Laurent Pinchart, linux-media, linux-kernel, stable
Hello Hans,
On Mon, Jul 7, 2025 at 10:01 AM Hans de Goede <hansg@kernel.org> wrote:
...
> > As mentioned during the review (see
> > 20250701192928.GB16835@pendragon.ideasonboard.com), I still prefer local
> > loop variables. Can we use that please ?
>
> Ok, I'll drop this from for-next.
>
> Desnes, can you prepare a v3 moving the toplevel declation
> inside the other loop please ?
Sure, I will send a v3 with the requested changes today.
Best Regards,
--
Desnes Nunes
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-07-08 12:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-01 17:25 [PATCH v2] media: uvcvideo: avoid variable shadowing in uvc_ctrl_cleanup_fh Desnes Nunes
2025-07-01 19:05 ` Ricardo Ribalda
2025-07-07 12:43 ` Hans de Goede
2025-07-07 12:50 ` Laurent Pinchart
2025-07-07 13:01 ` Hans de Goede
2025-07-08 12:40 ` Desnes Nunes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).