dvb-core: fix potential mutex_unlock without mutex_lock in dvb_dvr_read
PATCH 3/4 dvb-core: fix potential mutex_unlock without mutex_lock in dvb_dvr_read
From: Simon Arlott <[email protected]>
dvb_dvr_read may unlock the dmxdev mutex and return -ENODEV, except this function is a file op and will never be called with the mutex held.
There's existing mutex_lock and mutex_unlock around the actual read but it's commented out. These should probably be uncommented but the read blocks and this could block another non-blocking reader on the mutex instead.
This change comments out the extra mutex_unlock.
[[email protected]: cleanups, simplification]
Signed-off-by Simon Arlott <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/media/dvb/dvb-core/dmxdev.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/media/dvb/dvb-core/dmxdev.c renamed from drivers/media/dvb/dvb-core/dmxdev.c~dvb-core-fix-potential-mutex_unlock-without-mutex_lock-in-dvb_dvr_read +4 -10
@@ -244,19 +244,13 @@ static ssize_t dvb_dvr_read(struct file {struct dvb_device *dvbdev = file->private_data;struct dmxdev *dmxdev = dvbdev->priv; -int ret; -if (dmxdev->exit) { -mutex_unlock (&dmxdev->mutex); +if (dmxdev->exit)return -ENODEV ; - } -//mutex_lock(&dmxdev->mutex); - ret =dvb_dmxdev_buffer_read (&dmxdev->dvr_buffer, - file->f_flags &O_NONBLOCK , - buf, count, ppos); -//mutex_unlock(&dmxdev->mutex); -return ret; +return dvb_dmxdev_buffer_read (&dmxdev->dvr_buffer, + file->f_flags &O_NONBLOCK , + buf, count, ppos); } static int dvb_dvr_set_buffer_size(struct dmxdev *dmxdev,
_