Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8afdf48 authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville
Browse files

drivers/net/wireless/wl12xx: add missing kfree 

In each case, the freed data should be freed in the error handling code
as
well.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@exists@
local idexpression x;
statement S,S1;
expression E;
identifier fl;
expression *ptr != NULL;
@@

x = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...kfree(x)...+> }
     when any
     when != true x == NULL
x->fl
...>
(
if (x == NULL) S1
|
if (...) { ... when != x
               when forall
(
 return \(0\|<+...x...+>\|ptr\);
|
* return ...;
)
}
)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 674db134

drivers/net/wireless/wl12xx/acx.c

+1 −5
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth) 
	auth->sleep_auth = sleep_auth;



	ret = wl1271_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth));

	if (ret < 0)

		return ret;



out:

	kfree(auth);
@@ -624,10 +622,8 @@ int wl1271_acx_cca_threshold(struct wl1271 *wl) 


	ret = wl1271_cmd_configure(wl, ACX_CCA_THRESHOLD,

				   detection, sizeof(*detection));

	if (ret < 0) {

	if (ret < 0)

		wl1271_warning("failed to set cca threshold: %d", ret);

		return ret;

	}



out:

	kfree(detection);

drivers/net/wireless/wl12xx/testmode.c

+4 −1
Original line number Diff line number Diff line
@@ -139,12 +139,15 @@ static int wl1271_tm_cmd_interrogate(struct wl1271 *wl, struct nlattr *tb[]) 


	if (ret < 0) {

		wl1271_warning("testmode cmd interrogate failed: %d", ret);

		kfree(cmd);

		return ret;

	}



	skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, sizeof(*cmd));

	if (!skb)

	if (!skb) {

		kfree(cmd);

		return -ENOMEM;

	}



	NLA_PUT(skb, WL1271_TM_ATTR_DATA, sizeof(*cmd), cmd);