mt76_wcid_key_link_setup() enables the RX PN check for CCMP keys only. mac80211 does not check the PN either, because the IV is stripped, so on mt7996, whose hardware does not check it, replayed frames of the other AES ciphers reach the stack. Check the PN for all four ciphers. Keep the PN state of a wcid when an IGTK or BIGTK is installed on it, since these keys do not use it. Fixes: 04b8e65922f6 ("mt76: add mac80211 driver for MT7615 PCIe-based chipsets") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mac80211.c | 13 +++++-- drivers/net/wireless/mediatek/mt76/mt76.h | 34 ++++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index b1789be134d6..6b496dfda5cc 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -1279,21 +1279,28 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, struct ieee80211_key_conf *key) { struct ieee80211_key_seq seq; + u8 *pn; int i; mt76_wcid_key_link_setup(wcid, key); - if (!wcid->rx_check_pn) + if (!key || !mt76_key_has_rx_pn(key)) return; + if (key->cipher == WLAN_CIPHER_SUITE_GCMP || + key->cipher == WLAN_CIPHER_SUITE_GCMP_256) + pn = seq.gcmp.pn; + else + pn = seq.ccmp.pn; + /* data frame */ for (i = 0; i < IEEE80211_NUM_TIDS; i++) { ieee80211_get_key_rx_seq(key, i, &seq); - memcpy(wcid->rx_key_pn[i], seq.ccmp.pn, sizeof(seq.ccmp.pn)); + memcpy(wcid->rx_key_pn[i], pn, sizeof(wcid->rx_key_pn[i])); } /* robust management frame */ ieee80211_get_key_rx_seq(key, -1, &seq); - memcpy(wcid->rx_key_pn[i], seq.ccmp.pn, sizeof(seq.ccmp.pn)); + memcpy(wcid->rx_key_pn[i], pn, sizeof(wcid->rx_key_pn[i])); } EXPORT_SYMBOL(mt76_wcid_key_setup); diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 0b16567920fa..7a2a6afc3c21 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -1590,11 +1590,43 @@ int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid, u16 ssn, u16 size); void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid); +static inline bool +mt76_key_has_rx_pn(struct ieee80211_key_conf *key) +{ + switch (key->cipher) { + case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_CCMP_256: + case WLAN_CIPHER_SUITE_GCMP: + case WLAN_CIPHER_SUITE_GCMP_256: + return true; + default: + return false; + } +} + +static inline bool +mt76_key_is_bip(struct ieee80211_key_conf *key) +{ + switch (key->cipher) { + case WLAN_CIPHER_SUITE_AES_CMAC: + case WLAN_CIPHER_SUITE_BIP_CMAC_256: + case WLAN_CIPHER_SUITE_BIP_GMAC_128: + case WLAN_CIPHER_SUITE_BIP_GMAC_256: + return true; + default: + return false; + } +} + static inline void mt76_wcid_key_link_setup(struct mt76_wcid *wcid, struct ieee80211_key_conf *key) { - wcid->rx_check_pn = key && key->cipher == WLAN_CIPHER_SUITE_CCMP; + /* an IGTK or BIGTK shares the wcid of the GTK */ + if (key && mt76_key_is_bip(key)) + return; + + wcid->rx_check_pn = key && mt76_key_has_rx_pn(key); } void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, -- 2.47.3