* [PATCH] brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free}
[not found] <CGME20201027104456epcas1p44c0f3c748f5aa52da1725d3e5a24b3de@epcas1p4.samsung.com>
@ 2020-10-27 10:47 ` Seung-Woo Kim
2020-10-27 13:19 ` Arend Van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Seung-Woo Kim @ 2020-10-27 10:47 UTC (permalink / raw)
To: arend.vanspriel, franky.lin, hante.meuleman, chi-hsien.lin,
wright.feng, kvalo, davem, kuba, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list
Cc: smoch, sandals, rafal, digetx, double.lo, amsr, stanley.hsu,
saravanan.shanmugham, jean-philippe, frank.kao, netdev,
sw0312.kim, jh80.chung
There are missig brcmf_free() for brcmf_alloc(). Fix memory leak
by adding missed brcmf_free().
Reported-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---
.../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 6 ++++--
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 39381cb..d8db0db 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -1936,16 +1936,18 @@ static void brcmf_pcie_setup(struct device *dev, int ret,
fwreq = brcmf_pcie_prepare_fw_request(devinfo);
if (!fwreq) {
ret = -ENOMEM;
- goto fail_bus;
+ goto fail_brcmf;
}
ret = brcmf_fw_get_firmwares(bus->dev, fwreq, brcmf_pcie_setup);
if (ret < 0) {
kfree(fwreq);
- goto fail_bus;
+ goto fail_brcmf;
}
return 0;
+fail_brcmf:
+ brcmf_free(&devinfo->pdev->dev);
fail_bus:
kfree(bus->msgbuf);
kfree(bus);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 99987a7..59c2b2b 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4541,6 +4541,7 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
brcmf_sdiod_intr_unregister(bus->sdiodev);
brcmf_detach(bus->sdiodev->dev);
+ brcmf_free(bus->sdiodev->dev);
cancel_work_sync(&bus->datawork);
if (bus->brcmf_wq)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free}
2020-10-27 10:47 ` [PATCH] brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free} Seung-Woo Kim
@ 2020-10-27 13:19 ` Arend Van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend Van Spriel @ 2020-10-27 13:19 UTC (permalink / raw)
To: Seung-Woo Kim, franky.lin, hante.meuleman, chi-hsien.lin,
wright.feng, kvalo, davem, kuba, linux-wireless,
brcm80211-dev-list.pdl, brcm80211-dev-list
Cc: smoch, sandals, rafal, digetx, double.lo, amsr, stanley.hsu,
saravanan.shanmugham, jean-philippe, frank.kao, netdev,
jh80.chung
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
On 10/27/2020 11:47 AM, Seung-Woo Kim wrote:
> There are missig brcmf_free() for brcmf_alloc(). Fix memory leak
> by adding missed brcmf_free().
Probably should add Fixes: tag for commit a1f5aac1765af. See this link
[1] about the proper format.
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Reported-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 6 ++++--
> .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 +
> 2 files changed, 5 insertions(+), 2 deletions(-)
[1]
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#fixes_line_is_incorrect
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4176 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-27 13:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20201027104456epcas1p44c0f3c748f5aa52da1725d3e5a24b3de@epcas1p4.samsung.com>
2020-10-27 10:47 ` [PATCH] brcmfmac: Fix memory leak for unpaired brcmf_{alloc/free} Seung-Woo Kim
2020-10-27 13:19 ` Arend Van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).