Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b96175b authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath9k: Incorrect key used when group and pairwise ciphers are different. 



Updating sc_keytype multiple times when groupwise and pairwise
ciphers are different results in incorrect pairwise key type
assumed for TX control and normal ping fails. This works fine
for cases where both groupwise and pairwise ciphers are same.

Also use mac80211 provided enums for key length calculation.

Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 445df54f

drivers/net/wireless/ath9k/hw.c

+4 −4
Original line number Diff line number Diff line
@@ -7285,15 +7285,15 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, 
		}

		break;

	case ATH9K_CIPHER_WEP:

		if (k->kv_len < 40 / NBBY) {

		if (k->kv_len < LEN_WEP40) {

			DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,

				 "%s: WEP key length %u too small\n",

				 __func__, k->kv_len);

			return false;

		}

		if (k->kv_len <= 40 / NBBY)

		if (k->kv_len <= LEN_WEP40)

			keyType = AR_KEYTABLE_TYPE_40;

		else if (k->kv_len <= 104 / NBBY)

		else if (k->kv_len <= LEN_WEP104)

			keyType = AR_KEYTABLE_TYPE_104;

		else

			keyType = AR_KEYTABLE_TYPE_128;
@@ -7313,7 +7313,7 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, 
	key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask;

	key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff;

	key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask;

	if (k->kv_len <= 104 / NBBY)

	if (k->kv_len <= LEN_WEP104)

		key4 &= 0xff;



	if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) {

drivers/net/wireless/ath9k/main.c

+4 −2
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static int ath_key_config(struct ath_softc *sc, 
	if (!ret)

		return -EIO;



	if (mac)

		sc->sc_keytype = hk.kv_type;

	return 0;

}
@@ -756,6 +757,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw, 
			key->hw_key_idx = key->keyidx;

			/* push IV and Michael MIC generation to stack */

			key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;

			if (key->alg == ALG_TKIP)

				key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;

		}

		break;