Commit 40b503c7 authored Jun 15, 2015 by Arend van Spriel Committed by Kalle Valo Jun 16, 2015

brcmfmac: make brcmf_p2p_detach() call conditional



During verification of error handling in brcmf_cfg80211_attach() a
null pointer dereference occurred upon calling brcmf_p2p_detach()
from brcmf_detach(). This should only be called when the
brcmf_cfg80211_attach() has succeeded.

Fixes: f7a40873 ("brcmfmac: assure p2pdev is unregistered upon driver unload")
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent cb700df8

drivers/net/wireless/brcm80211/brcmfmac/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1098,6 +1098,7 @@ void brcmf_detach(struct device *dev)

		/* stop firmware event handling */
		brcmf_fweh_detach(drvr);
		if (drvr->config)
		brcmf_p2p_detach(&drvr->config->p2p);

		brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN);

Admin message