Patch "brcmfmac: fix pmksa->bssid usage" has been added to the 4.8-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
brcmfmac: fix pmksa->bssid usage
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
brcmfmac-fix-pmksa-bssid-usage.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7703773ef1d85b40433902a8da20167331597e4aMon Sep 17 00:00:00 2001
From: Nicolas Iooss <[email protected]>
Date: Tue, 23 Aug 2016 11:37:17 +0200
Subject: brcmfmac: fix pmksa->bssid usage
From: Nicolas Iooss <[email protected]>
commit 7703773ef1d85b40433902a8da20167331597e4a upstream.
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.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +2 -2
@@ -3884,11 +3884,11 @@ brcmf_cfg80211_del_pmksa(struct wiphy *wif (!check_vif_up (ifp->vif))return -EIO ; -brcmf_dbg (CONN ,"del_pmksa - PMK bssid = %pM\n" , &pmksa->bssid); +brcmf_dbg (CONN ,"del_pmksa - PMK bssid = %pM\n" , pmksa->bssid); npmk =le32_to_cpu (cfg->pmk_list.npmk);for (i =0 ; i < npmk; i++) -if (!memcmp (&pmksa->bssid, &pmk[i].bssid,ETH_ALEN )) +if (!memcmp (pmksa->bssid, pmk[i].bssid,ETH_ALEN ))break ;if ((npmk >0 ) && (i < npmk)) {
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/asoc-intel-atom-add-a-missing-star-in-a-memcpy-call.patch queue-4.8/brcmfmac-fix-pmksa-bssid-usage.patch