d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the keycache behaviour for multicast keycache search.

Browse Source 
The correct bit to set is 0x1 in the high MAC address byte, not 0x80.
The hardware isn't programmed with that bit (which is the multicast
adress bit.)

The linux ath9k keycache code uses that bit in the MAC as a "this is
a multicast key!" and doesn't set the AR_KEYTABLE_VALID bit.
This tells the hardware the MAC isn't to be used for unicast destination
matching but it can be used for multicast bssid traffic.

This fixes some encryption problems in station mode.

PR: kern/154598
This commit is contained in:
adrian 2011-02-09 15:23:16 +00:00
parent 059cd3cb74
commit 6cfd055711
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
View File

@ -99,11 +99,18 @@ ar5212ResetKeyCacheEntry(struct ath_hal *ah, uint16_t entry)
/*
* Sets the mac part of the specified key cache entry (and any
* associated MIC entry) and mark them valid.
*
* Since mac[0] is shifted off and not presented to the hardware,
* it does double duty as a "don't use for unicast, use for multicast
* matching" flag. This interface should later be extended to
* explicitly do that rather than overloading a bit in the MAC
* address.
*/
HAL_BOOL
ar5212SetKeyCacheEntryMac(struct ath_hal *ah, uint16_t entry, const uint8_t *mac)
{
uint32_t macHi, macLo;
uint32_t unicast_flag = AR_KEYTABLE_VALID;
if (entry >= AH_PRIVATE(ah)->ah_caps.halKeyCacheSize) {
HALDEBUG(ah, HAL_DEBUG_ANY, "%s: entry %u out of range\n",
@ -115,6 +122,16 @@ ar5212SetKeyCacheEntryMac(struct ath_hal *ah, uint16_t entry, const uint8_t *mac
* the 4 MSBs, and MacHi is the 2 LSBs.
*/
if (mac != AH_NULL) {
/*
* AR_KEYTABLE_VALID indicates that the address is a unicast
* address, which must match the transmitter address for
* decrypting frames.
* Not setting this bit allows the hardware to use the key
* for multicast frame decryption.
*/
if (mac[0] & 0x01)
unicast_flag = 0;
macHi = (mac[5] << 8) | mac[4];
macLo = (mac[3] << 24)| (mac[2] << 16)
| (mac[1] << 8) | mac[0];
@ -125,7 +142,7 @@ ar5212SetKeyCacheEntryMac(struct ath_hal *ah, uint16_t entry, const uint8_t *mac
macLo = macHi = 0;
}
OS_REG_WRITE(ah, AR_KEYTABLE_MAC0(entry), macLo);
OS_REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | AR_KEYTABLE_VALID);
OS_REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | unicast_flag);
return AH_TRUE;
}

4
sys/dev/ath/if_ath.c
View File

@ -1938,10 +1938,10 @@ ath_keyset(struct ath_softc *sc, const struct ieee80211_key *k,
/*
* Group keys on hardware that supports multicast frame
* key search use a MAC that is the sender's address with
* the high bit set instead of the app-specified address.
* the multicast bit set instead of the app-specified address.
*/
IEEE80211_ADDR_COPY(gmac, bss->ni_macaddr);
gmac[0] |= 0x80;
gmac[0] |= 0x01;
mac = gmac;
} else
mac = k->wk_macaddr;