p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

b43: Fix memory leaks in b43_bus_dev_ssb_init and b43_bus_dev_bcma_init 

The memory allocated by kzalloc in b43_bus_dev_ssb_init and
b43_bus_dev_bcma_init is not freed.
This patch fixes the bug by adding kfree in b43_ssb_remove,
b43_bcma_remove and error handling code of b43_bcma_probe.

Thanks Michael for his suggestion.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Acked-by: Michael Büsch <m@bues.ch>
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Jia-Ju Bai 2016-03-11 22:44:37 +05:30 committed by Kalle Valo
parent 9a3492194e
commit 372f7d6ac1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/broadcom/b43/main.c
View File

@ -5680,11 +5680,12 @@ static int b43_bcma_probe(struct bcma_device *core)
INIT_WORK(&wl->firmware_load, b43_request_firmware); INIT_WORK(&wl->firmware_load, b43_request_firmware);
schedule_work(&wl->firmware_load); schedule_work(&wl->firmware_load);
bcma_out:
return err; return err;
bcma_err_wireless_exit: bcma_err_wireless_exit:
ieee80211_free_hw(wl->hw); ieee80211_free_hw(wl->hw);
bcma_out:
kfree(dev);
return err; return err;
} }
@ -5712,8 +5713,8 @@ static void b43_bcma_remove(struct bcma_device *core)
b43_rng_exit(wl); b43_rng_exit(wl);
b43_leds_unregister(wl); b43_leds_unregister(wl);
ieee80211_free_hw(wl->hw); ieee80211_free_hw(wl->hw);
kfree(wldev->dev);
} }
static struct bcma_driver b43_bcma_driver = { static struct bcma_driver b43_bcma_driver = {
@ -5796,6 +5797,7 @@ static void b43_ssb_remove(struct ssb_device *sdev)
b43_leds_unregister(wl); b43_leds_unregister(wl);
b43_wireless_exit(dev, wl); b43_wireless_exit(dev, wl);
kfree(dev);
} }
static struct ssb_driver b43_ssb_driver = { static struct ssb_driver b43_ssb_driver = {