media: pvrusb2: fix warning in pvr2_i2c_core_done
syzbot has reported the following warning in pvr2_i2c_done: sysfs group 'power' not found for kobject '1-0043' When the device is disconnected (pvr_hdw_disconnect), the i2c adapter is not unregistered along with the USB and v4l2 teardown. As part of the USB device disconnect, the sysfs files of the subdevices are also deleted. So, by the time pvr_i2c_core_done is called by pvr_context_destroy, the sysfs files have been deleted. To fix this, unregister the i2c adapter too in pvr_hdw_disconnect. Make the device deregistration code shared by calling pvr_hdw_disconnect from pvr2_hdw_destroy. Reported-by: syzbot+e74a998ca8f1df9cc332@syzkaller.appspotmail.com Tested-by: syzbot+e74a998ca8f1df9cc332@syzkaller.appspotmail.com Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Родитель
8edcb5049a
Коммит
f8194e5e63
|
@ -2676,9 +2676,8 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
|
||||||
pvr2_stream_destroy(hdw->vid_stream);
|
pvr2_stream_destroy(hdw->vid_stream);
|
||||||
hdw->vid_stream = NULL;
|
hdw->vid_stream = NULL;
|
||||||
}
|
}
|
||||||
pvr2_i2c_core_done(hdw);
|
|
||||||
v4l2_device_unregister(&hdw->v4l2_dev);
|
v4l2_device_unregister(&hdw->v4l2_dev);
|
||||||
pvr2_hdw_remove_usb_stuff(hdw);
|
pvr2_hdw_disconnect(hdw);
|
||||||
mutex_lock(&pvr2_unit_mtx);
|
mutex_lock(&pvr2_unit_mtx);
|
||||||
do {
|
do {
|
||||||
if ((hdw->unit_number >= 0) &&
|
if ((hdw->unit_number >= 0) &&
|
||||||
|
@ -2705,6 +2704,7 @@ void pvr2_hdw_disconnect(struct pvr2_hdw *hdw)
|
||||||
{
|
{
|
||||||
pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_disconnect(hdw=%p)",hdw);
|
pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_disconnect(hdw=%p)",hdw);
|
||||||
LOCK_TAKE(hdw->big_lock);
|
LOCK_TAKE(hdw->big_lock);
|
||||||
|
pvr2_i2c_core_done(hdw);
|
||||||
LOCK_TAKE(hdw->ctl_lock);
|
LOCK_TAKE(hdw->ctl_lock);
|
||||||
pvr2_hdw_remove_usb_stuff(hdw);
|
pvr2_hdw_remove_usb_stuff(hdw);
|
||||||
LOCK_GIVE(hdw->ctl_lock);
|
LOCK_GIVE(hdw->ctl_lock);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче