media: uvc: uvc_v4l2.c: add temp variable for list iteration
Subsystems (2)
PATCH 4/20 media: uvc: uvc_v4l2.c: add temp variable for list iteration
From: "Daniel W. S. Almeida" <[email protected]>
Fixes the following coccinelle reports:
drivers/media/usb/uvc/uvc_v4l2.c:840:8-13:
ERROR: invalid reference to the index variable of the iterator on line 836
drivers/media/usb/uvc/uvc_v4l2.c:851:5-10:
ERROR: invalid reference to the index variable of the iterator on line 843
drivers/media/usb/uvc/uvc_v4l2.c:851:22-27:
ERROR: invalid reference to the index variable of the iterator on line 843
Byy introducing a temporary variable for list iteration.
Found using - Coccinelle (http://coccinelle.lip6.fr)
--- drivers/media/usb/uvc/uvc_v4l2.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/media/usb/uvc/uvc_v4l2.c +10 -6
@@ -826,6 +826,7 @@ static int uvc_ioctl_enum_input(struct file *file, void *fh,struct uvc_video_chain *chain = handle->chain;const struct uvc_entity *selector = chain->selector;struct uvc_entity *iterm =NULL ; +struct uvc_entity *cursor =NULL ;u32 index = input->index;int pin =0 ;
@@ -833,18 +834,22 @@ static int uvc_ioctl_enum_input(struct file *file, void *fh, (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {if (index !=0 )return -EINVAL ; -list_for_each_entry (iterm, &chain->entities, chain) { -if (UVC_ENTITY_IS_ITERM (iterm)) +list_for_each_entry (cursor, &chain->entities, chain) { +if (UVC_ENTITY_IS_ITERM (cursor)){ + iterm = cursor;break ; + } } pin = iterm->id; } else if (index < selector->bNrInPins) { pin = selector->baSourceID[index]; -list_for_each_entry (iterm, &chain->entities, chain) { -if (!UVC_ENTITY_IS_ITERM (iterm)) +list_for_each_entry (cursor, &chain->entities, chain) { +if (!UVC_ENTITY_IS_ITERM (cursor))continue ; -if (iterm->id == pin) +if (cursor->id == pin) { + iterm = cursor;break ; + } } }
@@ -1519,4 +1524,3 @@ const struct v4l2_file_operations uvc_fops = { .get_unmapped_area = uvc_v4l2_get_unmapped_area,#endif }; -
Signature · 1 line
2.28.0
Laurent Pinchart
maintainerHi Daniel,
Thank you for the patch.
Quoted 36 lines · Daniel W. S. Almeida
From: "Daniel W. S. Almeida" <[email protected]>
Fixes the following coccinelle reports:
drivers/media/usb/uvc/uvc_v4l2.c:840:8-13:
ERROR: invalid reference to the index variable of the iterator on line 836drivers/media/usb/uvc/uvc_v4l2.c:851:5-10:
ERROR: invalid reference to the index variable of the iterator on line 843drivers/media/usb/uvc/uvc_v4l2.c:851:22-27:
ERROR: invalid reference to the index variable of the iterator on line 843Byy introducing a temporary variable for list iteration.
Found using - Coccinelle (http://coccinelle.lip6.fr)
Signed-off-by Daniel W. S. Almeida <[email protected]>--- drivers/media/usb/uvc/uvc_v4l2.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)drivers/media/usb/uvc/uvc_v4l2.c +1
-0@@ -826,6 +826,7 @@ static int uvc_ioctl_enum_input(struct file *file, void *fh,struct uvc_video_chain *chain = handle->chain;const struct uvc_entity *selector = chain->selector;struct uvc_entity *iterm =NULL ; +struct uvc_entity *cursor =NULL ;u32 index = input->index;int pin =0 ;@@ -833,18 +834,22 @@ static int uvc_ioctl_enum_input(struct file *file, void *fh, (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
drivers/media/usb/uvc/uvc_v4l2.c static int uvc_ioctl_enum_input(struct file *file, void *fh, · line 842
Quoted 10 lines
drivers/media/usb/uvc/uvc_v4l2.c +4
-2if (index !=0 )return -EINVAL ; -list_for_each_entry (iterm, &chain->entities, chain) { -if (UVC_ENTITY_IS_ITERM (iterm)) +list_for_each_entry (cursor, &chain->entities, chain) { +if (UVC_ENTITY_IS_ITERM (cursor)){ + iterm = cursor;break ; + } }
If no entity is found by this loop the next line will dereference a NULL pointer. There's a similar issue below.
I think the issues reported by coccinelle are false positives, as every chain is guaranteed to have the proper input terminals (ITERM). This is verified when constructing the chain at probe time.
Quoted 21 lines
drivers/media/usb/uvc/uvc_v4l2.c +5
-4pin = iterm->id; }else if (index < selector->bNrInPins) { pin = selector->baSourceID[index]; -list_for_each_entry (iterm, &chain->entities, chain) { -if (!UVC_ENTITY_IS_ITERM (iterm)) +list_for_each_entry (cursor, &chain->entities, chain) { +if (!UVC_ENTITY_IS_ITERM (cursor))continue ; -if (iterm->id == pin) +if (cursor->id == pin) { + iterm = cursor;break ; + } } }@@ -1519,4 +1524,3 @@ const struct v4l2_file_operations uvc_fops = { .get_unmapped_area = uvc_v4l2_get_unmapped_area,#endif }; -
Signature · 3 lines
Regards, Laurent Pinchart
Hi Laurent, thanks for reviewing!
Quoted 2 lines
If no entity is found by this loop the next line will dereference a NULL pointer. There's a similar issue below.
You mean this line, right?
Quoted 1 line
pin = iterm->id;
In which case, yes I missed it!
Quoted 3 lines
I think the issues reported by coccinelle are false positives, as every chain is guaranteed to have the proper input terminals (ITERM). This is verified when constructing the chain at probe time.
I thought so too, but I thought it would be nice to get rid of the warning anyways. Probably other people will send patches for this same issue in the future too, i.e. until this warning is not there anymore.
Do you have any suggestions or should we just leave this alone? :)
Maybe:
if (iterm)
pin = iterm->id
This line will return an error if the iterm is not found anyway:
if (iterm == NULL || iterm->id != pin) return -EINVAL
Let me know what you think
- Daniel