Skip to contentSkip to conversation

usbtv: Fix refcounting mixup

PATCH New Oliver Neukum 1 participant 1 message Sep 24, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 usbtv: Fix refcounting mixup

The premature free in the error path is blocked by V4L refcounting, not USB refcounting. Thanks to Ben Hutchings for review.

[v2] corrected attributions

Fixes 50e704453553 ("media: usbtv: prevent double free in error case")
---
 drivers/media/usb/usbtv/usbtv-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/usbtv/usbtv-core.c +2 -1
index ee9c656d121f..2308c0b4f5e7 100644
@@ -113,7 +113,8 @@ static int usbtv_probe(struct usb_interface *intf,
 
 usbtv_audio_fail:
 	/* we must not free at this point */
-	usb_get_dev(usbtv->udev);
+	v4l2_device_get(&usbtv->v4l2_dev);
+	/* this will undo the v4l2_device_get() */
 	usbtv_video_free(usbtv);
 
 usbtv_video_fail:
Signature · 1 line
2.26.2