Re: [for-4.13] brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice
Arend Van Sprielwrote: > Due to a bugfix in wireless tree and the commit mentioned below a merge > was needed which went haywire. So the submitted change resulted in the > function brcmf_sdiod_sgtable_alloc() being called twice during the probe > thus leaking the memory of the first call. > > Cc: sta...@vger.kernel.org # 4.6.x > Fixes: 4d7928959832 ("brcmfmac: switch to new platform data") > Reported-by: Stefan Wahren > Tested-by: Stefan Wahren > Reviewed-by: Hante Meuleman > Signed-off-by: Arend van Spriel Patch applied to wireless-drivers.git, thanks. 5f5d03143de5 brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice -- https://patchwork.kernel.org/patch/9864681/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH for-4.13] brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice
Arend van Sprielwrites: > Due to a bugfix in wireless tree and the commit mentioned below a merge > was needed which went haywire. So the submitted change resulted in the > function brcmf_sdiod_sgtable_alloc() being called twice during the probe > thus leaking the memory of the first call. > > Cc: sta...@vger.kernel.org # 4.6.x > Fixes: 4d7928959832 ("brcmfmac: switch to new platform data") > Reported-by: Stefan Wahren > Tested-by: Stefan Wahren > Reviewed-by: Hante Meuleman > Signed-off-by: Arend van Spriel I'll queue this for 4.13. -- Kalle Valo
[PATCH for-4.13] brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice
Due to a bugfix in wireless tree and the commit mentioned below a merge was needed which went haywire. So the submitted change resulted in the function brcmf_sdiod_sgtable_alloc() being called twice during the probe thus leaking the memory of the first call. Cc: sta...@vger.kernel.org # 4.6.x Fixes: 4d7928959832 ("brcmfmac: switch to new platform data") Reported-by: Stefan WahrenTested-by: Stefan Wahren Reviewed-by: Hante Meuleman Signed-off-by: Arend van Spriel --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 - 1 file changed, 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index c3ecec6..f355612 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4175,11 +4175,6 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) goto fail; } - /* allocate scatter-gather table. sg support -* will be disabled upon allocation failure. -*/ - brcmf_sdiod_sgtable_alloc(bus->sdiodev); - /* Query the F2 block size, set roundup accordingly */ bus->blocksize = bus->sdiodev->func[2]->cur_blksize; bus->roundup = min(max_roundup, bus->blocksize); -- 1.9.1