diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2020-12-02 18:20:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:26:06 +0100 |
| commit | ae1f265fbf4e38bfb18686f98fc0442a687e3b44 (patch) | |
| tree | 4180def730d17770f62fbb6838ac6abb842bb993 | |
| parent | e46034c8520a0746fb9e7d8069343d6d026a36a7 (diff) | |
| download | linux-stable-ae1f265fbf4e38bfb18686f98fc0442a687e3b44.tar.gz linux-stable-ae1f265fbf4e38bfb18686f98fc0442a687e3b44.tar.bz2 linux-stable-ae1f265fbf4e38bfb18686f98fc0442a687e3b44.zip | |
media: gspca: Fix memory leak in probe
commit e469d0b09a19496e1972a20974bbf55b728151eb upstream.
The gspca driver leaks memory when a probe fails. gspca_dev_probe2()
calls v4l2_device_register(), which takes a reference to the
underlying device node (in this case, a USB interface). But the
failure pathway neglects to call v4l2_device_unregister(), the routine
responsible for dropping this reference. Consequently the memory for
the USB interface and its device never gets released.
This patch adds the missing function call.
Reported-and-tested-by: syzbot+44e64397bd81d5e84cba@syzkaller.appspotmail.com
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: <stable@vger.kernel.org>
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/gspca/gspca.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index c9a2b29a60a5..93212ed80bf8 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c @@ -1585,6 +1585,7 @@ out: input_unregister_device(gspca_dev->input_dev); #endif v4l2_ctrl_handler_free(gspca_dev->vdev.ctrl_handler); + v4l2_device_unregister(&gspca_dev->v4l2_dev); kfree(gspca_dev->usb_buf); kfree(gspca_dev); return ret; |