Re: [patch] [media] dvb: unlock on error in dvb_ca_en50221_io_do_ioctl()

[Nikolaus Schulz]

On Fri, Jan 04, 2013 at 09:56:02PM +0300, Dan Carpenter wrote:
 We recently pushed the locking down into this function, but there was
 an error path where the unlock was missed.

Ugh, indeed. Thanks for catching this!

Nikolaus.
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[patch] [media] dvb: unlock on error in dvb_ca_en50221_io_do_ioctl()

[Dan Carpenter]

We recently pushed the locking down into this function, but there was
an error path where the unlock was missed.

Signed-off-by: Dan Carpenter dan.carpen...@oracle.com
---
Only needed in linux-next.

diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c 
b/drivers/media/dvb-core/dvb_ca_en50221.c
index 190e5e0..0aac309 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1227,8 +1227,10 @@ static int dvb_ca_en50221_io_do_ioctl(struct file *file,
case CA_GET_SLOT_INFO: {
struct ca_slot_info *info = parg;
 
-   if ((info-num  ca-slot_count) || (info-num  0))
-   return -EINVAL;
+   if ((info-num  ca-slot_count) || (info-num  0)) {
+   err = -EINVAL;
+   goto out_unlock;
+   }
 
info-type = CA_CI_LINK;
info-flags = 0;
@@ -1247,6 +1249,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct file *file,
break;
}
 
+out_unlock:
mutex_unlock(ca-ioctl_mutex);
return err;
 }
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html