openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath: Modify ath_key_delete() to not need full key entry 

tkip_keymap can be used internally to avoid the reference to key->cipher
and with this, only the key index value itself is needed. This allows
ath_key_delete() call to be postponed to be handled after the upper
layer STA and key entry have already been removed. This is needed to
make ath9k key cache management safer.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201214172118.18100-5-jouni@codeaurora.org
This commit is contained in:
Jouni Malinen 2020-12-14 19:21:17 +02:00 committed by Kalle Valo
parent d2d3e36498
commit 144cd24dbc
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath.h
View File

@ -197,7 +197,7 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
bool ath_is_mybeacon(struct ath_common *common, struct ieee80211_hdr *hdr); bool ath_is_mybeacon(struct ath_common *common, struct ieee80211_hdr *hdr);
void ath_hw_setbssidmask(struct ath_common *common); void ath_hw_setbssidmask(struct ath_common *common);
void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key); void ath_key_delete(struct ath_common *common, u8 hw_key_idx);
int ath_key_config(struct ath_common *common, int ath_key_config(struct ath_common *common,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,

2
drivers/net/wireless/ath/ath5k/mac80211-ops.c
View File

@ -522,7 +522,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
} }
break; break;
case DISABLE_KEY: case DISABLE_KEY:
ath_key_delete(common, key); ath_key_delete(common, key->hw_key_idx);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;

2
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@ -1461,7 +1461,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw,
} }
break; break;
case DISABLE_KEY: case DISABLE_KEY:
ath_key_delete(common, key); ath_key_delete(common, key->hw_key_idx);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;

5
drivers/net/wireless/ath/ath9k/main.c
View File

@ -1543,12 +1543,11 @@ static void ath9k_del_ps_key(struct ath_softc *sc,
{ {
struct ath_common *common = ath9k_hw_common(sc->sc_ah); struct ath_common *common = ath9k_hw_common(sc->sc_ah);
struct ath_node *an = (struct ath_node *) sta->drv_priv; struct ath_node *an = (struct ath_node *) sta->drv_priv;
struct ieee80211_key_conf ps_key = { .hw_key_idx = an->ps_key };
if (!an->ps_key) if (!an->ps_key)
return; return;
ath_key_delete(common, &ps_key); ath_key_delete(common, an->ps_key);
an->ps_key = 0; an->ps_key = 0;
an->key_idx[0] = 0; an->key_idx[0] = 0;
} }
@ -1748,7 +1747,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
} }
break; break;
case DISABLE_KEY: case DISABLE_KEY:
ath_key_delete(common, key); ath_key_delete(common, key->hw_key_idx);
if (an) { if (an) {
for (i = 0; i < ARRAY_SIZE(an->key_idx); i++) { for (i = 0; i < ARRAY_SIZE(an->key_idx); i++) {
if (an->key_idx[i] != key->hw_key_idx) if (an->key_idx[i] != key->hw_key_idx)

34
drivers/net/wireless/ath/key.c
View File

@ -581,38 +581,38 @@ EXPORT_SYMBOL(ath_key_config);
/* /*
* Delete Key. * Delete Key.
*/ */
void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key) void ath_key_delete(struct ath_common *common, u8 hw_key_idx)
{ {
/* Leave CCMP and TKIP (main key) configured to avoid disabling /* Leave CCMP and TKIP (main key) configured to avoid disabling
* encryption for potentially pending frames already in a TXQ with the * encryption for potentially pending frames already in a TXQ with the
* keyix pointing to this key entry. Instead, only clear the MAC address * keyix pointing to this key entry. Instead, only clear the MAC address
* to prevent RX processing from using this key cache entry. * to prevent RX processing from using this key cache entry.
*/ */
if (test_bit(key->hw_key_idx, common->ccmp_keymap) || if (test_bit(hw_key_idx, common->ccmp_keymap) ||
test_bit(key->hw_key_idx, common->tkip_keymap)) test_bit(hw_key_idx, common->tkip_keymap))
ath_hw_keysetmac(common, key->hw_key_idx, NULL); ath_hw_keysetmac(common, hw_key_idx, NULL);
else else
ath_hw_keyreset(common, key->hw_key_idx); ath_hw_keyreset(common, hw_key_idx);
if (key->hw_key_idx < IEEE80211_WEP_NKID) if (hw_key_idx < IEEE80211_WEP_NKID)
return; return;
clear_bit(key->hw_key_idx, common->keymap); clear_bit(hw_key_idx, common->keymap);
clear_bit(key->hw_key_idx, common->ccmp_keymap); clear_bit(hw_key_idx, common->ccmp_keymap);
if (key->cipher != WLAN_CIPHER_SUITE_TKIP) if (!test_bit(hw_key_idx, common->tkip_keymap))
return; return;
clear_bit(key->hw_key_idx + 64, common->keymap); clear_bit(hw_key_idx + 64, common->keymap);
clear_bit(key->hw_key_idx, common->tkip_keymap); clear_bit(hw_key_idx, common->tkip_keymap);
clear_bit(key->hw_key_idx + 64, common->tkip_keymap); clear_bit(hw_key_idx + 64, common->tkip_keymap);
if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) { if (!(common->crypt_caps & ATH_CRYPT_CAP_MIC_COMBINED)) {
ath_hw_keyreset(common, key->hw_key_idx + 32); ath_hw_keyreset(common, hw_key_idx + 32);
clear_bit(key->hw_key_idx + 32, common->keymap); clear_bit(hw_key_idx + 32, common->keymap);
clear_bit(key->hw_key_idx + 64 + 32, common->keymap); clear_bit(hw_key_idx + 64 + 32, common->keymap);
clear_bit(key->hw_key_idx + 32, common->tkip_keymap); clear_bit(hw_key_idx + 32, common->tkip_keymap);
clear_bit(key->hw_key_idx + 64 + 32, common->tkip_keymap); clear_bit(hw_key_idx + 64 + 32, common->tkip_keymap);
} }
} }
EXPORT_SYMBOL(ath_key_delete); EXPORT_SYMBOL(ath_key_delete);