drivers/isdn/capi/kcapi.c: Adjust error handling code involving capi_ctr_put
Subsystems (2)
PATCH 1/4 drivers/isdn/capi/kcapi.c: Adjust error handling code involving capi_ctr_put
From: Julia Lawall <[email protected]>
After calling capi_ctr_get, error handling code should call capi_ctr_put.
The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r@
expression x,E;
statement S;
position p1,p2,p3;
@@
(
if ((x = capi_ctr_get@p1(...)) == NULL || ...) S |
x = capi_ctr_get@p1(...)
... when != x
if (x == NULL || ...) S
)
<...
if@p3 (...) { ... when != capi_ctr_put(x)
when != if (x) { ... capi_ctr_put(x); ...}
return@p2 ...;
}...>
(
return x;
|
return 0;
|
x = E
|
E = x
|capi_ctr_put(x)
)
@exists@
position r.p1,r.p2,r.p3;
expression x;
int ret != 0;
statement S;
@@
* x = capi_ctr_get@p1(...)
<...
* if@p3 (...)
S
...>
* return@p2 \(NULL\|ret\);
// </smpl>
---
drivers/isdn/capi/kcapi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/isdn/capi/kcapi.c renamed from drivers/isdn/capi/kcapi.c~drivers-isdn-capi-kcapic-adjust-error-handling-code-involving-capi_ctr_put +4 -0
@@ -828,15 +828,18 @@ static int old_capi_manufacturer(unsignereturn -ESRCH ;if (card->load_firmware ==NULL ) {printk (KERN_DEBUG "kcapi: load: no load function\n" ); +capi_ctr_put (card);return -ESRCH ; }if (ldef.t4file.len <=0 ) {printk (KERN_DEBUG "kcapi: load: invalid parameter: length of t4file is %d ?\n" , ldef.t4file.len); +capi_ctr_put (card);return -EINVAL ; }if (ldef.t4file.data ==NULL ) {printk (KERN_DEBUG "kcapi: load: invalid parameter: dataptr is 0\n" ); +capi_ctr_put (card);return -EINVAL ; }
@@ -849,6 +852,7 @@ static int old_capi_manufacturer(unsigneif (card->cardstate !=CARD_DETECTED ) {printk (KERN_INFO "kcapi: load: contr=%d not in detect state\n" , ldef.contr); +capi_ctr_put (card);return -EBUSY ; } card->cardstate =CARD_LOADING ;
_
From: [email protected]
Date: Mon, 22 Sep 2008 14:51:01 -0700
Quoted 1 line
After calling
capi_ctr_get, error handling code should callcapi_ctr_put.
...
Quoted 4 lines
Signed-off-by Julia Lawall <[email protected]>Cc Karsten Keil <[email protected]>Cc "David S. Miller" <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Applied to net-next-2.6, thanks.