Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b25a1cf authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: vivid: fix error handling of kthread_run 



commit 701f49bc028edb19ffccd101997dd84f0d71e279 upstream.

kthread_run returns an error pointer, but elsewhere in the code
dev->kthread_vid_cap/out is checked against NULL.

If kthread_run returns an error, then set the pointer to NULL.

I chose this method over changing all kthread_vid_cap/out tests
elsewhere since this is more robust.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: default avatar <syzbot+53d5b2df0d9744411e2e@syzkaller.appspotmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 91716346

drivers/media/platform/vivid/vivid-kthread-cap.c

+4 −1
Original line number Diff line number Diff line
@@ -877,8 +877,11 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) 
			"%s-vid-cap", dev->v4l2_dev.name);



	if (IS_ERR(dev->kthread_vid_cap)) {

		int err = PTR_ERR(dev->kthread_vid_cap);



		dev->kthread_vid_cap = NULL;

		v4l2_err(&dev->v4l2_dev, "kernel_thread() failed\n");

		return PTR_ERR(dev->kthread_vid_cap);

		return err;

	}

	*pstreaming = true;

	vivid_grab_controls(dev, true);

drivers/media/platform/vivid/vivid-kthread-out.c

+4 −1
Original line number Diff line number Diff line
@@ -248,8 +248,11 @@ int vivid_start_generating_vid_out(struct vivid_dev *dev, bool *pstreaming) 
			"%s-vid-out", dev->v4l2_dev.name);



	if (IS_ERR(dev->kthread_vid_out)) {

		int err = PTR_ERR(dev->kthread_vid_out);



		dev->kthread_vid_out = NULL;

		v4l2_err(&dev->v4l2_dev, "kernel_thread() failed\n");

		return PTR_ERR(dev->kthread_vid_out);

		return err;

	}

	*pstreaming = true;

	vivid_grab_controls(dev, true);