UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free} 

There are missig brcmf_free() for brcmf_alloc(). Fix memory leak
by adding missed brcmf_free().

Reported-by: Jaehoon Chung <jh80.chung@samsung.com>
Fixes: a1f5aac176 ("brcmfmac: don't realloc wiphy during PCIe reset")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1603849967-22817-1-git-send-email-sw0312.kim@samsung.com
This commit is contained in:
Seung-Woo Kim 2020-10-28 10:52:47 +09:00 committed by Kalle Valo
parent 398d816a64
commit 9db946284e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
View File

@ -1937,16 +1937,18 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
fwreq = brcmf_pcie_prepare_fw_request(devinfo); fwreq = brcmf_pcie_prepare_fw_request(devinfo);
if (!fwreq) { if (!fwreq) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail_bus; goto fail_brcmf;
} }
ret = brcmf_fw_get_firmwares(bus->dev, fwreq, brcmf_pcie_setup); ret = brcmf_fw_get_firmwares(bus->dev, fwreq, brcmf_pcie_setup);
if (ret < 0) { if (ret < 0) {
kfree(fwreq); kfree(fwreq);
goto fail_bus; goto fail_brcmf;
} }
return 0; return 0;
fail_brcmf:
brcmf_free(&devinfo->pdev->dev);
fail_bus: fail_bus:
kfree(bus->msgbuf); kfree(bus->msgbuf);
kfree(bus); kfree(bus);

1
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
View File

@ -4541,6 +4541,7 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
brcmf_sdiod_intr_unregister(bus->sdiodev); brcmf_sdiod_intr_unregister(bus->sdiodev);
brcmf_detach(bus->sdiodev->dev); brcmf_detach(bus->sdiodev->dev);
brcmf_free(bus->sdiodev->dev);
cancel_work_sync(&bus->datawork); cancel_work_sync(&bus->datawork);
if (bus->brcmf_wq) if (bus->brcmf_wq)