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

Commit ffeb9ec7 authored by Andrew Morton's avatar Andrew Morton Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5699): Cinergyt2: fix file release handler 



If this mutex_lock_interruptible() does fail due to signal_pending() then the
state of the driver will get trashed in interesting ways, because userspace
cannot and will not retry the close().

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 624fc7f5

drivers/media/dvb/cinergyT2/cinergyT2.c

+1 −2
Original line number Diff line number Diff line
@@ -519,8 +519,7 @@ static int cinergyt2_release (struct inode *inode, struct file *file) 
	struct dvb_device *dvbdev = file->private_data;

	struct cinergyt2 *cinergyt2 = dvbdev->priv;



	if (mutex_lock_interruptible(&cinergyt2->sem))

		return -ERESTARTSYS;

	mutex_lock(&cinergyt2->sem);



	if (!cinergyt2->disconnect_pending && (file->f_flags & O_ACCMODE) != O_RDONLY) {

		cancel_delayed_work(&cinergyt2->query_work);