Commit 60d5c9f5 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman

drivers/staging/brcm80211/brcmfmac/wl_iw.c: introduce missing kfree

Error handling code following a kmalloc should free the allocated data.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
(
x->f1 = E
|
 (x->f1 == NULL || ...)
|
 f(...,x->f1,...)
)
...>
(
 return \(0\|<+...x...+>\|ptr\);
|
 return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 29811f9d
...@@ -3672,8 +3672,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp) ...@@ -3672,8 +3672,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
return -ENOMEM; return -ENOMEM;
iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL); iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL);
if (!iscan->iscan_ex_params_p) if (!iscan->iscan_ex_params_p) {
kfree(iscan);
return -ENOMEM; return -ENOMEM;
}
iscan->iscan_ex_param_size = params_size; iscan->iscan_ex_param_size = params_size;
iscan->sysioc_tsk = NULL; iscan->sysioc_tsk = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment