2018-12-19 09:17:41

by Zumeng Chen

Subject: [PATCH 1/1] wlcore: Fix memory leak in case wl12xx_fetch_firmware failure

Release fw_status, raw_fw_status, and tx_res_if when wl12xx_fetch_firmware
failed instead of meaningless goto out to avoid the following memory leak
reports(Only the last one listed):

unreferenced object 0xc28a9a00 (size 512):
comm "kworker/0:4", pid 31298, jiffies 2783204 (age 203.290s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<6624adab>] kmemleak_alloc+0x40/0x74
[<500ddb31>] kmem_cache_alloc_trace+0x1ac/0x270
[<db4d731d>] wl12xx_chip_wakeup+0xc4/0x1fc [wlcore]
[<76c5db53>] wl1271_op_add_interface+0x4a4/0x8f4 [wlcore]
[<cbf30777>] drv_add_interface+0xa4/0x1a0 [mac80211]
[<65bac325>] ieee80211_reconfig+0x9c0/0x1644 [mac80211]
[<2817c80e>] ieee80211_restart_work+0x90/0xc8 [mac80211]
[<7e1d425a>] process_one_work+0x284/0x42c
[<55f9432e>] worker_thread+0x2fc/0x48c
[<abb582c6>] kthread+0x148/0x160
[<63144b13>] ret_from_fork+0x14/0x2c
[< (null)>] (null)
[<1f6e7715>] 0xffffffff

Signed-off-by: Zumeng Chen <[email protected]>
---
drivers/net/wireless/ti/wlcore/main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 26b1873..2e12de8 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1085,8 +1085,11 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
goto out;

ret = wl12xx_fetch_firmware(wl, plt);
- if (ret < 0)
- goto out;
+ if (ret < 0) {
+ kfree(wl->fw_status);
+ kfree(wl->raw_fw_status);
+ kfree(wl->tx_res_if);
+ }

out:
return ret;
--
2.7.5

2019-01-10 11:34:46

by Kalle Valo

Subject: Re: [PATCH 1/1] wlcore: Fix memory leak in case wl12xx_fetch_firmware failure

Zumeng Chen <[email protected]> wrote:

> Release fw_status, raw_fw_status, and tx_res_if when wl12xx_fetch_firmware
> failed instead of meaningless goto out to avoid the following memory leak
> reports(Only the last one listed):
>
> unreferenced object 0xc28a9a00 (size 512):
> comm "kworker/0:4", pid 31298, jiffies 2783204 (age 203.290s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> backtrace:
> [<6624adab>] kmemleak_alloc+0x40/0x74
> [<500ddb31>] kmem_cache_alloc_trace+0x1ac/0x270
> [<db4d731d>] wl12xx_chip_wakeup+0xc4/0x1fc [wlcore]
> [<76c5db53>] wl1271_op_add_interface+0x4a4/0x8f4 [wlcore]
> [<cbf30777>] drv_add_interface+0xa4/0x1a0 [mac80211]
> [<65bac325>] ieee80211_reconfig+0x9c0/0x1644 [mac80211]
> [<2817c80e>] ieee80211_restart_work+0x90/0xc8 [mac80211]
> [<7e1d425a>] process_one_work+0x284/0x42c
> [<55f9432e>] worker_thread+0x2fc/0x48c
> [<abb582c6>] kthread+0x148/0x160
> [<63144b13>] ret_from_fork+0x14/0x2c
> [< (null)>] (null)
> [<1f6e7715>] 0xffffffff
>
> Signed-off-by: Zumeng Chen <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

ba2ffc96321c wlcore: Fix memory leak in case wl12xx_fetch_firmware failure

--
https://patchwork.kernel.org/patch/10736825/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches