]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
net80211: prevent plaintext injection by A-MSDU RFC1042/EAPOL frames
authorMathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
Sun, 6 Jun 2021 22:10:56 +0000 (22:10 +0000)
committerMark Johnston <markj@FreeBSD.org>
Tue, 15 Mar 2022 18:16:01 +0000 (14:16 -0400)
commit1c136ac8a969a0c39962371a0b187845373015c1
treed0b34792c2f11fd84f210a5682d5200846d259d4
parent060c556da720145912ac79f67e91ef656f74a78b
net80211: prevent plaintext injection by A-MSDU RFC1042/EAPOL frames

No longer accept plaintext A-MSDU frames that start with an RFC1042
header with EtherType EAPOL.  This is done by only accepting EAPOL
packets that are included in non-aggregated 802.11 frames.

Note that before this patch, FreeBSD also only accepted EAPOL frames
that are sent in a non-aggregated 802.11 frame due to bugs in
processing EAPOL packets inside A-MSDUs. In other words,
compatibility with legitimate devices remains the same.

This relates to section 6.5 in the 2021 Usenix "FragAttacks" (Fragment
and Forge: Breaking Wi-Fi Through Frame Aggregation and Fragmentation)
paper.

Submitted by: Mathy Vanhoef (Mathy.Vanhoef kuleuven.be)
Security: CVE-2020-26144
PR: 256120

(cherry picked from commit ffc19cf52da5546973965f78cf32aa0f2c9657f8)
(cherry picked from commit 8b2ba742cc2c732bc4bc1d43f8256adce06657d0)
(cherry picked from commit 2d09e4366b67dd719ebae5390436868e5430d833)

Approved by: so
Security: FreeBSD-SA-22:02.wifi
sys/net80211/ieee80211_adhoc.c
sys/net80211/ieee80211_hostap.c
sys/net80211/ieee80211_sta.c
sys/net80211/ieee80211_wds.c