aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Khoroshilov <khoroshilov@ispras.ru>2012-04-05 18:53:20 -0300
committerBen Hutchings <ben@decadent.org.uk>2012-05-11 13:13:57 +0100
commit2c51332d50dd5eba50821d0decc4f64e4b71226e (patch)
tree396dcac22d2b16f3c7d6be74f7797f5e135b9188
parenta15d032c254a9d0cd0640190cef33a5b840290c7 (diff)
downloadkernel_samsung_smdk4412-2c51332d50dd5eba50821d0decc4f64e4b71226e.zip
kernel_samsung_smdk4412-2c51332d50dd5eba50821d0decc4f64e4b71226e.tar.gz
kernel_samsung_smdk4412-2c51332d50dd5eba50821d0decc4f64e4b71226e.tar.bz2
drxk: Does not unlock mutex if sanity check failed in scu_command()
commit e4459e1682c107d7ee1bf102c1ba534230e9b50b upstream. If sanity check fails in scu_command(), goto error leads to unlock of an unheld mutex. The check should not fail in reality, but it nevertheless worth fixing. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index f6431ef..a1f5e3d 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -1523,8 +1523,10 @@ static int scu_command(struct drxk_state *state,
dprintk(1, "\n");
if ((cmd == 0) || ((parameterLen > 0) && (parameter == NULL)) ||
- ((resultLen > 0) && (result == NULL)))
- goto error;
+ ((resultLen > 0) && (result == NULL))) {
+ printk(KERN_ERR "drxk: Error %d on %s\n", status, __func__);
+ return status;
+ }
mutex_lock(&state->mutex);