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

Commit 96838d61 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Kalle Valo
Browse files

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: default avatarJia-Ju Bai <baijiaju1990@163.com>
Tested-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarJulian Calaby <julian.calaby@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent fe9b4794

drivers/net/wireless/broadcom/b43/main.c

+4 −2
Original line number Diff line number Diff line
@@ -5680,11 +5680,12 @@ static int b43_bcma_probe(struct bcma_device *core) 
	INIT_WORK(&wl->firmware_load, b43_request_firmware);

	schedule_work(&wl->firmware_load);



bcma_out:

	return err;



bcma_err_wireless_exit:

	ieee80211_free_hw(wl->hw);

bcma_out:

	kfree(dev);

	return err;

}
@@ -5712,8 +5713,8 @@ static void b43_bcma_remove(struct bcma_device *core) 
	b43_rng_exit(wl);



	b43_leds_unregister(wl);



	ieee80211_free_hw(wl->hw);

	kfree(wldev->dev);

}



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_wireless_exit(dev, wl);

	kfree(dev);

}



static struct ssb_driver b43_ssb_driver = {