diff mbox series

[git:media_tree/master] media: usbtv: Fix refcounting mixup

Message ID E1kQPxa-008XNm-RZ@www.linuxtv.org
State Accepted
Commit bf65f8aabdb37bc1a785884374e919477fe13e10
Headers show
Series [git:media_tree/master] media: usbtv: Fix refcounting mixup | expand

Commit Message

Mauro Carvalho Chehab Oct. 8, 2020, 7:08 a.m. UTC 
This is an automatic generated email to let you know that the following patch were queued:

Subject: media: usbtv: Fix refcounting mixup
Author:  Oliver Neukum <oneukum@suse.com>
Date:    Thu Sep 24 11:14:10 2020 +0200

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

[v2] corrected attributions

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Fixes: 50e704453553 ("media: usbtv: prevent double free in error case")
CC: stable@vger.kernel.org
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

 drivers/media/usb/usbtv/usbtv-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

---
diff mbox series

Patch

diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index ee9c656d121f..2308c0b4f5e7 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -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: