Skip to contentSkip to conversation

media: uvc_v4l2: fix possible memory leak in uvc_ioctl_ctrl_map

PATCH In review Hangyu Hua 3 participants 4 messages Mar 24, 2022

Subsystems (2)
lore
Share & tools
lore

Hangyu Hua

author
#0 lore raw

PATCH 1/1 media: uvc_v4l2: fix possible memory leak in uvc_ioctl_ctrl_map

map->name needs to be freed when uvc_ioctl_ctrl_map fails.

---
 drivers/media/usb/uvc/uvc_v4l2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/usb/uvc/uvc_v4l2.c +1 -0
index 711556d13d03..e46a2f3b06cb 100644
@@ -93,6 +93,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 
 	kfree(map->menu_info);
 free_map:
+	kfree(map->name);
 	kfree(map);
 
 	return ret;
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Hi Hangyu,

Thank you for the patch.

Quoted 12 lines · Hangyu Hua

map->name needs to be freed when uvc_ioctl_ctrl_map fails.

---
 drivers/media/usb/uvc/uvc_v4l2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/usb/uvc/uvc_v4l2.c +0 -0
index 711556d13d03..e46a2f3b06cb 100644

drivers/media/usb/uvc/uvc_v4l2.c static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, · line 96

Quoted 4 lines
drivers/media/usb/uvc/uvc_v4l2.c +1 -0
@@ -93,6 +93,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 
 	kfree(map->menu_info);
 free_map:
+	kfree(map->name);

The memory is actually freed in uvc_ctrl_cleanup_mappings() in the non-error case. I think we could improve this by avoiding the kmemdup() in this function, and duplicating the name in __uvc_ctrl_add_mapping() instead. What do you think ?

Quoted 3 lines
drivers/media/usb/uvc/uvc_v4l2.c +0 -0
 	kfree(map);
 
 	return ret;
Signature · 3 lines
Regards,

Laurent Pinchart
#2 lore raw
In reply to Hangyu Hua

Isnt it a dupe of:
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
?

Quoted 23 lines · Hangyu Hua

map->name needs to be freed when uvc_ioctl_ctrl_map fails.

---
 drivers/media/usb/uvc/uvc_v4l2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/usb/uvc/uvc_v4l2.c +1 -1
index 711556d13d03..e46a2f3b06cb 100644
@@ -93,6 +93,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 
        kfree(map->menu_info);
 free_map:
+       kfree(map->name);
        kfree(map);
 
        return ret;
--

2.25.1

Signature · 1 line
Ricardo Ribalda
maintainer
#3 lore raw
Quoted 3 lines · Ricardo Ribalda

Isnt it a dupe of:
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
?

It is. I'll review that one.

Quoted 21 lines · Hangyu Hua
Quoted 20 lines

map->name needs to be freed when uvc_ioctl_ctrl_map fails.

---
 drivers/media/usb/uvc/uvc_v4l2.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/usb/uvc/uvc_v4l2.c +1 -0
index 711556d13d03..e46a2f3b06cb 100644
@@ -93,6 +93,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain,
 
        kfree(map->menu_info);
 free_map:
+       kfree(map->name);
        kfree(map);
 
        return ret;
Signature · 3 lines
Regards,

Laurent Pinchart