Skip to content

Commit

Permalink
brcmfmac: Fix a double-free in brcmf_sdio_bus_reset
Browse files Browse the repository at this point in the history
[ Upstream commit 7ea7a1e ]

brcmf_sdiod_remove has been called inside brcmf_sdiod_probe when fails,
so there's no need to call another one. Otherwise, sdiodev->freezer
would be double freed.

Fixes: 7836102 ("brcmfmac: reset SDIO bus on a firmware crash")
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210601100128.69561-1-tongtiangen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Tong Tiangen authored and gregkh committed Jul 14, 2021
1 parent 5b8d0b0 commit 5d452ea
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Expand Up @@ -4157,7 +4157,6 @@ static int brcmf_sdio_bus_reset(struct device *dev)
if (ret) {
brcmf_err("Failed to probe after sdio device reset: ret %d\n",
ret);
brcmf_sdiod_remove(sdiodev);
}

return ret;
Expand Down

0 comments on commit 5d452ea

Please sign in to comment.