|
|
@@ -0,0 +1,26 @@
|
|
|
+From: Xing Song <[email protected]>
|
|
|
+Date: Mon, 1 Nov 2021 10:46:57 +0800
|
|
|
+Subject: [PATCH] mac80211: do not access the IV when it was stripped
|
|
|
+
|
|
|
+ieee80211_get_keyid() will return false value if IV has been stripped,
|
|
|
+such as return 0 for IP/ARP frames due to LLC header, and return -EINVAL
|
|
|
+for disassociation frames due to its length... etc. Don't try to access
|
|
|
+it if it's not present.
|
|
|
+
|
|
|
+Signed-off-by: Xing Song <[email protected]>
|
|
|
+Link: https://lore.kernel.org/r/[email protected]
|
|
|
+Signed-off-by: Johannes Berg <[email protected]>
|
|
|
+---
|
|
|
+
|
|
|
+--- a/net/mac80211/rx.c
|
|
|
++++ b/net/mac80211/rx.c
|
|
|
+@@ -1952,7 +1952,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_
|
|
|
+ int keyid = rx->sta->ptk_idx;
|
|
|
+ sta_ptk = rcu_dereference(rx->sta->ptk[keyid]);
|
|
|
+
|
|
|
+- if (ieee80211_has_protected(fc)) {
|
|
|
++ if (ieee80211_has_protected(fc) &&
|
|
|
++ !(status->flag & RX_FLAG_IV_STRIPPED)) {
|
|
|
+ cs = rx->sta->cipher_scheme;
|
|
|
+ keyid = ieee80211_get_keyid(rx->skb, cs);
|
|
|
+
|