Commit 22f88fcf authored Aug 29, 2011 by Alexey Khoroshilov Committed by Greg Kroah-Hartman Aug 29, 2011

staging/easycap: fix mismatch in easycap_poll() mutex lock-unlock



In case if condition (kd != isdongle(peasycap)) becomes true,
easycap_poll() returns without releasing easycapdc60_dongle[kd].mutex_video.
The patch adds mutex_unlock() before that return.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 0f18f767

drivers/staging/easycap/easycap_main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -953,8 +953,10 @@ static unsigned int easycap_poll(struct file file, poll_table wait)
		* peasycap, IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
		* IF NECESSARY, BAIL OUT.
		*/
		if (kd != isdongle(peasycap))
		if (kd != isdongle(peasycap)) {
		mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
		return -ERESTARTSYS;
		}
		if (!file) {
		SAY("ERROR: file is NULL\n");
		mutex_unlock(&easycapdc60_dongle[kd].mutex_video);