]>
Commit | Line | Data |
---|---|---|
9a904337 SL |
1 | From 7f8be1b441b2e1076dc50e279815825294452f86 Mon Sep 17 00:00:00 2001 |
2 | From: Zumeng Chen <zumeng.chen@gmail.com> | |
3 | Date: Wed, 19 Dec 2018 15:50:29 +0800 | |
4 | Subject: wlcore: Fix memory leak in case wl12xx_fetch_firmware failure | |
5 | ||
6 | [ Upstream commit ba2ffc96321c8433606ceeb85c9e722b8113e5a7 ] | |
7 | ||
8 | Release fw_status, raw_fw_status, and tx_res_if when wl12xx_fetch_firmware | |
9 | failed instead of meaningless goto out to avoid the following memory leak | |
10 | reports(Only the last one listed): | |
11 | ||
12 | unreferenced object 0xc28a9a00 (size 512): | |
13 | comm "kworker/0:4", pid 31298, jiffies 2783204 (age 203.290s) | |
14 | hex dump (first 32 bytes): | |
15 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ | |
16 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ | |
17 | backtrace: | |
18 | [<6624adab>] kmemleak_alloc+0x40/0x74 | |
19 | [<500ddb31>] kmem_cache_alloc_trace+0x1ac/0x270 | |
20 | [<db4d731d>] wl12xx_chip_wakeup+0xc4/0x1fc [wlcore] | |
21 | [<76c5db53>] wl1271_op_add_interface+0x4a4/0x8f4 [wlcore] | |
22 | [<cbf30777>] drv_add_interface+0xa4/0x1a0 [mac80211] | |
23 | [<65bac325>] ieee80211_reconfig+0x9c0/0x1644 [mac80211] | |
24 | [<2817c80e>] ieee80211_restart_work+0x90/0xc8 [mac80211] | |
25 | [<7e1d425a>] process_one_work+0x284/0x42c | |
26 | [<55f9432e>] worker_thread+0x2fc/0x48c | |
27 | [<abb582c6>] kthread+0x148/0x160 | |
28 | [<63144b13>] ret_from_fork+0x14/0x2c | |
29 | [< (null)>] (null) | |
30 | [<1f6e7715>] 0xffffffff | |
31 | ||
32 | Signed-off-by: Zumeng Chen <zumeng.chen@gmail.com> | |
33 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> | |
34 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
35 | --- | |
36 | drivers/net/wireless/ti/wlcore/main.c | 7 +++++-- | |
37 | 1 file changed, 5 insertions(+), 2 deletions(-) | |
38 | ||
39 | diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c | |
40 | index 575c8f6d4009..16b69b026f8f 100644 | |
41 | --- a/drivers/net/wireless/ti/wlcore/main.c | |
42 | +++ b/drivers/net/wireless/ti/wlcore/main.c | |
43 | @@ -1110,8 +1110,11 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt) | |
44 | goto out; | |
45 | ||
46 | ret = wl12xx_fetch_firmware(wl, plt); | |
47 | - if (ret < 0) | |
48 | - goto out; | |
49 | + if (ret < 0) { | |
50 | + kfree(wl->fw_status); | |
51 | + kfree(wl->raw_fw_status); | |
52 | + kfree(wl->tx_res_if); | |
53 | + } | |
54 | ||
55 | out: | |
56 | return ret; | |
57 | -- | |
58 | 2.19.1 | |
59 |