[patch] hiddraw.c missing unlocks in unlocked_ioctl
flat view
STALE6394d
From: Dan Carpenter <hidden>
Date: 2009-03-31 12:58:25
There were 2 places that returned directly instead of releasing their locks. I sent a fix for this file earlier but ended up missing these spots. I think what happened is that I have improved my checker script since then... Or maybe I just screwed up. regards, dan carpenter Signed-off-by: Dan Carpenter <redacted>
--- orig/drivers/hid/hidraw.c 2009-03-30 21:16:07.000000000 +0300
+++ devel/drivers/hid/hidraw.c 2009-03-30 21:18:37.000000000 +0300@@ -274,8 +274,10 @@ if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { int len; - if (!hid->name) - return 0; + if (!hid->name) { + ret = 0; + break; + } len = strlen(hid->name) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
@@ -286,8 +288,10 @@ if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { int len; - if (!hid->phys) - return 0; + if (!hid->phys) { + ret = 0; + break; + } len = strlen(hid->phys) + 1; if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);