Comment 1 Lars Engels 2011-02-08 21:32:42 UTC

Responsible Changed
From-To: freebsd-bugs->adrian

over to adrian

Comment 2 dfilter service 2011-02-09 15:23:23 UTC

Author: adrian
Date: Wed Feb  9 15:23:16 2011
New Revision: 218483
URL: http://svn.freebsd.org/changeset/base/218483

Log:
  Fix the keycache behaviour for multicast keycache search.
  
  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

Modified:
  head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c	Wed Feb  9 14:37:33 2011	(r218482)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c	Wed Feb  9 15:23:16 2011	(r218483)
@@ -99,11 +99,18 @@ ar5212ResetKeyCacheEntry(struct ath_hal 
 /*
  * 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
 	 * 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
 		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;
 }
 

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Wed Feb  9 14:37:33 2011	(r218482)
+++ head/sys/dev/ath/if_ath.c	Wed Feb  9 15:23:16 2011	(r218483)
@@ -1938,10 +1938,10 @@ ath_keyset(struct ath_softc *sc, const s
 		/*
 		 * 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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 3 Eitan Adler 2011-03-01 15:10:52 UTC

State Changed
From-To: open->patched

committed in head (r218483)

Comment 4 Adrian Chadd 2011-04-09 04:02:32 UTC

Responsible Changed
From-To: adrian->freebsd-wireless

bump to mailing-list

Comment 5 Ed Maste 2018-10-04 00:47:11 UTC

Adrian is this complete?

Comment 6 Mark Linimon 2021-06-30 01:42:25 UTC

^Triage: overcome by events.