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

Commit 4e770f76 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] gspca_main: Locking fixes 1 



The gspca_dev->streaming boolean is protected against multiple access
through gspca_dev->queue_lock everywhere except for 2 places. This patch
fixes this by bringing it under the lock in vidioc_streamoff. And by
removing the check for gspca_dev->streaming in gspca_disconnect,
the destroy_urbs call may be called multiple times (and is protected
by the usb_lock) and calling wake_up_interruptible can also always be done
safely.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 82f4b5b6

drivers/media/video/gspca/gspca.c

+9 −6
Original line number Diff line number Diff line
@@ -1630,11 +1630,15 @@ static int vidioc_streamoff(struct file *file, void *priv, 


	if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;

	if (!gspca_dev->streaming)

		return 0;



	if (mutex_lock_interruptible(&gspca_dev->queue_lock))

		return -ERESTARTSYS;



	if (!gspca_dev->streaming) {

		ret = 0;

		goto out;

	}



	/* check the capture file */

	if (gspca_dev->capt_file != file) {

		ret = -EBUSY;
@@ -2341,12 +2345,11 @@ void gspca_disconnect(struct usb_interface *intf) 
	PDEBUG(D_PROBE, "%s disconnect",

		video_device_node_name(&gspca_dev->vdev));

	mutex_lock(&gspca_dev->usb_lock);



	gspca_dev->present = 0;

	wake_up_interruptible(&gspca_dev->wq);



	if (gspca_dev->streaming) {

	destroy_urbs(gspca_dev);

		wake_up_interruptible(&gspca_dev->wq);

	}



#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)

	gspca_input_destroy_urb(gspca_dev);