From: Arend van Spriel <arend@broadcom.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Hante Meuleman <hante.meuleman@broadcom.com>,
Arend van Spriel <arend@broadcom.com>
Subject: [PATCH 4/8] brcmfmac: fix p2p scan abort null pointer exception
Date: Mon, 11 Apr 2016 11:35:24 +0200 [thread overview]
Message-ID: <1460367328-12082-5-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1460367328-12082-1-git-send-email-arend@broadcom.com>
From: Hante Meuleman <hante.meuleman@broadcom.com>
When p2p connection setup is performed without having ever done an
escan a null pointer exception can occur. This is because the ifp
to abort scanning is taken from escan struct while it was never
initialized. Fix this by using the primary ifp for scan abort. The
abort should still be performed and all scan related commands are
performed on primary ifp.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index b5a49e5..9408717 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -1266,7 +1266,7 @@ static void
brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)
{
struct brcmf_p2p_info *p2p = &cfg->p2p;
- struct brcmf_if *ifp = cfg->escan_info.ifp;
+ struct brcmf_if *ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
if (test_bit(BRCMF_P2P_STATUS_SENDING_ACT_FRAME, &p2p->status) &&
(test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status) ||
--
1.9.1
next prev parent reply other threads:[~2016-04-11 9:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 9:35 [PATCH 0/8] brcmfmac: event handling and other fixes Arend van Spriel
2016-04-11 9:35 ` [PATCH 1/8] brcmfmac: clear eventmask array before using it Arend van Spriel
2016-04-14 13:01 ` [1/8] " Kalle Valo
2016-04-11 9:35 ` [PATCH 2/8] brcmfmac: fix clearing wowl wake indicators Arend van Spriel
2016-04-11 9:35 ` [PATCH 3/8] brcmfmac: insert default boardrev in nvram data if missing Arend van Spriel
2016-04-16 8:15 ` Rafał Miłecki
2016-04-11 9:35 ` Arend van Spriel [this message]
2016-04-11 9:35 ` [PATCH 5/8] brcmfmac: screening firmware event packet Arend van Spriel
2016-04-11 9:35 ` [PATCH 6/8] brcmfmac: cleanup ampdu-rx host reorder code Arend van Spriel
2016-04-11 9:35 ` [PATCH 7/8] brcmfmac: revise handling events in receive path Arend van Spriel
2016-04-25 10:00 ` Rafał Miłecki
2016-04-25 10:40 ` Rafał Miłecki
2016-04-11 9:35 ` [PATCH 8/8] brcmfmac: create common function for handling brcmf_proto_hdrpull() Arend van Spriel
2016-04-11 11:20 ` [PATCH 0/8] brcmfmac: event handling and other fixes Rafał Miłecki
2016-04-12 8:55 ` Arend van Spriel
2016-04-12 11:49 ` Julian Calaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460367328-12082-5-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).