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

Commit 48f98f75 authored by Janne Grunau's avatar Janne Grunau Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11231): hdpvr: locking fixes 



unlock io_mutex in hdpvr_stop_streaming hdpvr_disconnect to allow the
streaming worker to stop before we flush the workqueue.
do not return to user space with mutex held in vidioc_encoder_cmd with
an unknown encoder command.

Signed-off-by: default avatarJanne Grunau <j@jannau.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d2ff3ec8

drivers/media/video/hdpvr/hdpvr-core.c

+2 −0
Original line number Diff line number Diff line
@@ -390,8 +390,10 @@ static void hdpvr_disconnect(struct usb_interface *interface) 
	video_unregister_device(dev->video_dev);

	wake_up_interruptible(&dev->wait_data);

	wake_up_interruptible(&dev->wait_buffer);

	mutex_unlock(&dev->io_mutex);

	msleep(100);

	flush_workqueue(dev->workqueue);

	mutex_lock(&dev->io_mutex);

	hdpvr_cancel_queue(dev);

	destroy_workqueue(dev->workqueue);

	mutex_unlock(&dev->io_mutex);

drivers/media/video/hdpvr/hdpvr-video.c

+3 −1
Original line number Diff line number Diff line
@@ -300,12 +300,14 @@ static int hdpvr_stop_streaming(struct hdpvr_device *dev) 


	dev->status = STATUS_SHUTTING_DOWN;

	hdpvr_config_call(dev, CTRL_STOP_STREAMING_VALUE, 0x00);

	mutex_unlock(&dev->io_mutex);



	wake_up_interruptible(&dev->wait_buffer);

	msleep(50);



	flush_workqueue(dev->workqueue);



	mutex_lock(&dev->io_mutex);

	/* kill the still outstanding urbs */

	hdpvr_cancel_queue(dev);
@@ -1130,7 +1132,7 @@ static int vidioc_encoder_cmd(struct file *filp, void *priv, 
	default:

		v4l2_dbg(MSG_INFO, hdpvr_debug, dev->video_dev,

			 "Unsupported encoder cmd %d\n", a->cmd);

		return -EINVAL;

		res = -EINVAL;

	}

	mutex_unlock(&dev->io_mutex);

	return res;