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

Commit a1671b22 authored by Xing Song's avatar Xing Song Committed by Greg Kroah-Hartman
Browse files

mac80211: do not access the IV when it was stripped 



[ Upstream commit 77dfc2bc0bb4b8376ecd7a430f27a4a8fff6a5a0 ]

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: default avatarXing Song <xing.song@mediatek.com>
Link: https://lore.kernel.org/r/20211101024657.143026-1-xing.song@mediatek.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3200cf7b

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,8 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
		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);