diff options
| author | Oliver Neukum <oneukum@suse.com> | 2020-09-24 11:14:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-17 08:56:29 +0200 |
| commit | d6efa7525a593c11f1f0d0ac2dd0f67eb471c586 (patch) | |
| tree | 6ec83b29aae1c045e50e208e02021d64be2ae3fe | |
| parent | 1b7150e1c95eb61c8fec801203f84b17f90563bd (diff) | |
| download | linux-d6efa7525a593c11f1f0d0ac2dd0f67eb471c586.tar.gz linux-d6efa7525a593c11f1f0d0ac2dd0f67eb471c586.tar.bz2 linux-d6efa7525a593c11f1f0d0ac2dd0f67eb471c586.zip | |
media: usbtv: Fix refcounting mixup
commit bf65f8aabdb37bc1a785884374e919477fe13e10 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/usb/usbtv/usbtv-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
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: |