package/kernel/mac80211/patches/360-0002-brcmfmac-make-brcmf_p2p_detach-call-conditional.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Mon, 15 Jun 2015 22:48:39 +0200
   3 Subject: [PATCH] brcmfmac: make brcmf_p2p_detach() call conditional
   4
   5 During verification of error handling in brcmf_cfg80211_attach() a
   6 null pointer dereference occurred upon calling brcmf_p2p_detach()
   7 from brcmf_detach(). This should only be called when the
   8 brcmf_cfg80211_attach() has succeeded.
   9
  10 Fixes: f7a40873d2fa ("brcmfmac: assure p2pdev is unregistered upon driver unload")
  11 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
  12 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
  13 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17
  18 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
  19 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
  20 @@ -1098,7 +1098,8 @@ void brcmf_detach(struct device *dev)
  21
  22         /* stop firmware event handling */
  23         brcmf_fweh_detach(drvr);
  24 -       brcmf_p2p_detach(&drvr->config->p2p);
  25 +       if (drvr->config)
  26 +               brcmf_p2p_detach(&drvr->config->p2p);
  27
  28         brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN);
  29