package/kernel/mac80211/patches/349-0004-brcmfmac-fix-p2p-scan-abort-null-pointer-exception.patch

   1 From: Hante Meuleman <hante.meuleman@broadcom.com>
   2 Date: Mon, 11 Apr 2016 11:35:24 +0200
   3 Subject: [PATCH] brcmfmac: fix p2p scan abort null pointer exception
   4
   5 When p2p connection setup is performed without having ever done an
   6 escan a null pointer exception can occur. This is because the ifp
   7 to abort scanning is taken from escan struct while it was never
   8 initialized. Fix this by using the primary ifp for scan abort. The
   9 abort should still be performed and all scan related commands are
  10 performed on primary ifp.
  11
  12 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
  13 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  14 Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
  15 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  16 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  17 ---
  18
  19 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  20 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  21 @@ -1266,7 +1266,7 @@ static void
  22  brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)
  23  {
  24         struct brcmf_p2p_info *p2p = &cfg->p2p;
  25 -       struct brcmf_if *ifp = cfg->escan_info.ifp;
  26 +       struct brcmf_if *ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
  27
  28         if (test_bit(BRCMF_P2P_STATUS_SENDING_ACT_FRAME, &p2p->status) &&
  29             (test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status) ||