Commit 5f5d0314 authored Jul 26, 2017 by Arend Van Spriel Committed by Kalle Valo Jul 27, 2017

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: stable@vger.kernel.org # 4.6.x
Fixes: 4d792895 ("brcmfmac: switch to new platform data")
Reported-by: Stefan Wahren <stefan.wahren@i2se.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 58f36b45

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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);