aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/brcmfmac
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-04-01 10:23:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-20 17:11:43 -0400
commit60d5c9f5b6a2f5ce09712b7f7d0b0bf979a150be (patch)
tree79cec4d68226929f060b95e85de4126a47572349 /drivers/staging/brcm80211/brcmfmac
parent29811f9d8973e65b46da4283d52f02f78a21f6e0 (diff)
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: Julia Lawall <julia@diku.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/wl_iw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index b49957fb758..4e4cf36af51 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -3672,8 +3672,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
3672 return -ENOMEM; 3672 return -ENOMEM;
3673 3673
3674 iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL); 3674 iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL);
3675 if (!iscan->iscan_ex_params_p) 3675 if (!iscan->iscan_ex_params_p) {
3676 kfree(iscan);
3676 return -ENOMEM; 3677 return -ENOMEM;
3678 }
3677 iscan->iscan_ex_param_size = params_size; 3679 iscan->iscan_ex_param_size = params_size;
3678 iscan->sysioc_tsk = NULL; 3680 iscan->sysioc_tsk = NULL;
3679 3681