brcmfmac: fix brcmf_wiphy_wowl_params() NULL pointer dereference

Commit Message

Chi-Hsien Lin Aug. 7, 2018, 6:18 a.m. UTC

From: Winnie Chang <[e-mail]>

The kernel BUG happens when wowl is enabled from firmware. In
brcmf_wiphy_wowl_params(), cfg is a NULL pointer because it is
drvr->config returned from wiphy_to_cfg(), and drvr->config is not set
yet. To fix it, set drvr->config before brcmf_setup_wiphy() which
calls brcmf_wiphy_wowl_params().

The kernel panic is introduced in below commit:
commit id: 856d5a011c86b59f6564be4508912fb1d866adfc
brcmfmac: allocate struct brcmf_pub instance using wiphy_new()

Signed-off-by: Winnie Chang <[e-mail]>
Reviewed-by: Chi-Hsien Lin <[e-mail]>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Kalle Valo Aug. 7, 2018, 11:28 a.m. UTC | #1

Chi-Hsien Lin <[e-mail]> writes:

> From: Winnie Chang <[e-mail]>
>
> The kernel BUG happens when wowl is enabled from firmware. In
> brcmf_wiphy_wowl_params(), cfg is a NULL pointer because it is
> drvr->config returned from wiphy_to_cfg(), and drvr->config is not set
> yet. To fix it, set drvr->config before brcmf_setup_wiphy() which
> calls brcmf_wiphy_wowl_params().
>
> The kernel panic is introduced in below commit:
> commit id: 856d5a011c86b59f6564be4508912fb1d866adfc
> brcmfmac: allocate struct brcmf_pub instance using wiphy_new()
>
> Signed-off-by: Winnie Chang <[e-mail]>
> Reviewed-by: Chi-Hsien Lin <[e-mail]>

Chi-Hsien, you need to include your own s-o-b as well when you are
submitting the patch:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#signed-off-by_missing

Chi-Hsien Lin Aug. 7, 2018, 1:40 p.m. UTC | #2

On 08/07/2018 7:28, Kalle Valo wrote:
> Chi-Hsien Lin <[e-mail]> writes:
> 
>> From: Winnie Chang <[e-mail]>
>>
>> The kernel BUG happens when wowl is enabled from firmware. In
>> brcmf_wiphy_wowl_params(), cfg is a NULL pointer because it is
>> drvr->config returned from wiphy_to_cfg(), and drvr->config is not set
>> yet. To fix it, set drvr->config before brcmf_setup_wiphy() which
>> calls brcmf_wiphy_wowl_params().
>>
>> The kernel panic is introduced in below commit:
>> commit id: 856d5a011c86b59f6564be4508912fb1d866adfc
>> brcmfmac: allocate struct brcmf_pub instance using wiphy_new()
>>
>> Signed-off-by: Winnie Chang <[e-mail]>
>> Reviewed-by: Chi-Hsien Lin <[e-mail]>
> 
> Chi-Hsien, you need to include your own s-o-b as well when you are
> submitting the patch:
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#signed-off-by_missing

Hi Kalle,

Thanks a lot for the notes. I've added proper s-o-b in V2.

Chi-hsien Lin

> 
> --
> Kalle Valo
> 
> 
> ----------
> 
> You're receiving this message because you're a member of the brcm80211-dev-list group.
> .
>

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 24c4e18..5444e62 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6926,15 +6926,15 @@  struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 	cfg->d11inf.io_type = (u8)io_type;
 	brcmu_d11_attach(&cfg->d11inf);
 
-	err = brcmf_setup_wiphy(wiphy, ifp);
-	if (err < 0)
-		goto priv_out;
-
 	/* regulatory notifer below needs access to cfg so
 	 * assign it now.
 	 */
 	drvr->config = cfg;
 
+	err = brcmf_setup_wiphy(wiphy, ifp);
+	if (err < 0)
+		goto priv_out;
+
 	brcmf_dbg(INFO, "Registering custom regulatory\n");
 	wiphy->reg_notifier = brcmf_cfg80211_reg_notifier;
 	wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;