aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/broadcom
diff options
context:
space:
mode:
authorNicolas Iooss <nicolas.iooss_linux@m4x.org>2016-08-23 05:37:17 -0400
committerKalle Valo <kvalo@codeaurora.org>2016-09-03 13:02:03 -0400
commit7703773ef1d85b40433902a8da20167331597e4a (patch)
tree33ff4571dfacab44ec1565d1662389acb0780c1c /drivers/net/wireless/broadcom
parentbccf3ffc8c6d8e0251a15541bb4d12b423c4f729 (diff)
brcmfmac: fix pmksa->bssid usage
The struct cfg80211_pmksa defines its bssid field as: const u8 *bssid; contrary to struct brcmf_pmksa, which uses: u8 bssid[ETH_ALEN]; Therefore in brcmf_cfg80211_del_pmksa(), &pmksa->bssid takes the address of this field (of type u8**), not the one of its content (which would be u8*). Remove the & operator to make brcmf_dbg("%pM") and memcmp() behave as expected. This bug have been found using a custom static checker (which checks the usage of %p... attributes at build time). It has been introduced in commit 6c404f34f2bd ("brcmfmac: Cleanup pmksa cache handling code"), which replaced pmksa->bssid by &pmksa->bssid while refactoring the code, without modifying struct cfg80211_pmksa definition. Replace &pmk[i].bssid with pmk[i].bssid too to make the code clearer, this change does not affect the semantic. Fixes: 6c404f34f2bd ("brcmfmac: Cleanup pmksa cache handling code") Cc: stable@vger.kernel.org Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom')
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 2628d5e12c64..201a98016142 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3884,11 +3884,11 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *ndev,
3884 if (!check_vif_up(ifp->vif)) 3884 if (!check_vif_up(ifp->vif))
3885 return -EIO; 3885 return -EIO;
3886 3886
3887 brcmf_dbg(CONN, "del_pmksa - PMK bssid = %pM\n", &pmksa->bssid); 3887 brcmf_dbg(CONN, "del_pmksa - PMK bssid = %pM\n", pmksa->bssid);
3888 3888
3889 npmk = le32_to_cpu(cfg->pmk_list.npmk); 3889 npmk = le32_to_cpu(cfg->pmk_list.npmk);
3890 for (i = 0; i < npmk; i++) 3890 for (i = 0; i < npmk; i++)
3891 if (!memcmp(&pmksa->bssid, &pmk[i].bssid, ETH_ALEN)) 3891 if (!memcmp(pmksa->bssid, pmk[i].bssid, ETH_ALEN))
3892 break; 3892 break;
3893 3893
3894 if ((npmk > 0) && (i < npmk)) { 3894 if ((npmk > 0) && (i < npmk)) {