* [PATCH] uvc: fix access to uninitialized fields on probe error
@ 2019-04-30 12:28 Oliver Neukum
2019-05-02 11:43 ` Laurent Pinchart
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Neukum @ 2019-04-30 12:28 UTC (permalink / raw)
To: mchehab, laurent.pinchart, linux-media; +Cc: Oliver Neukum
We need to check whether this work we are canceling actually is
initialized.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reported-by: syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com
---
drivers/media/usb/uvc/uvc_ctrl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 14cff91b7aea..2b510c56cf91 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -2350,7 +2350,9 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev)
struct uvc_entity *entity;
unsigned int i;
- cancel_work_sync(&dev->async_ctrl.work);
+ /* can be uninitialized if we are aborting on probe error */
+ if (dev->async_ctrl.work.func)
+ cancel_work_sync(&dev->async_ctrl.work);
/* Free controls and control mappings for all entities. */
list_for_each_entry(entity, &dev->entities, list) {
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] uvc: fix access to uninitialized fields on probe error
2019-04-30 12:28 [PATCH] uvc: fix access to uninitialized fields on probe error Oliver Neukum
@ 2019-05-02 11:43 ` Laurent Pinchart
2019-05-06 10:36 ` Oliver Neukum
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Pinchart @ 2019-05-02 11:43 UTC (permalink / raw)
To: Oliver Neukum; +Cc: mchehab, linux-media
Hi Oliver,
Thank you for the patch.
On Tue, Apr 30, 2019 at 02:28:14PM +0200, Oliver Neukum wrote:
> We need to check whether this work we are canceling actually is
> initialized.
I think we should add
Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives")
> Signed-off-by: Oliver Neukum <oneukum@suse.com>
> Reported-by: syzbot+2e1ef9188251d9cc7944@syzkaller.appspotmail.com
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 14cff91b7aea..2b510c56cf91 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -2350,7 +2350,9 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev)
> struct uvc_entity *entity;
> unsigned int i;
>
> - cancel_work_sync(&dev->async_ctrl.work);
> + /* can be uninitialized if we are aborting on probe error */
Let's capitalise the comment and end it with a period to match the rest
of the driver. With these small issues fixed,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
If you agree with the changes there's no need to resubmit, I'll fix when
applying.
> + if (dev->async_ctrl.work.func)
> + cancel_work_sync(&dev->async_ctrl.work);
>
> /* Free controls and control mappings for all entities. */
> list_for_each_entry(entity, &dev->entities, list) {
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] uvc: fix access to uninitialized fields on probe error
2019-05-02 11:43 ` Laurent Pinchart
@ 2019-05-06 10:36 ` Oliver Neukum
0 siblings, 0 replies; 3+ messages in thread
From: Oliver Neukum @ 2019-05-06 10:36 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: mchehab, linux-media
On Do, 2019-05-02 at 14:43 +0300, Laurent Pinchart wrote:
> Let's capitalise the comment and end it with a period to match the rest
> of the driver. With these small issues fixed,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Hi,
thank you. I agree with them.
Regards
Oliver
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-06 10:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-30 12:28 [PATCH] uvc: fix access to uninitialized fields on probe error Oliver Neukum
2019-05-02 11:43 ` Laurent Pinchart
2019-05-06 10:36 ` Oliver Neukum
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.