git: 1c136ac8a969 - releng/12.3 - net80211: prevent plaintext injection by A-MSDU RFC1042/EAPOL frames
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Mar 2022 18:16:17 UTC
The branch releng/12.3 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=1c136ac8a969a0c39962371a0b187845373015c1
commit 1c136ac8a969a0c39962371a0b187845373015c1
Author: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
AuthorDate: 2021-06-06 22:10:56 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-03-15 18:16:01 +0000
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 | 18 ++++++++++++------
sys/net80211/ieee80211_hostap.c | 18 ++++++++++++------
sys/net80211/ieee80211_sta.c | 18 ++++++++++++------
sys/net80211/ieee80211_wds.c | 18 ++++++++++++------
4 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index e2164bbb46a1..150515222268 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -571,7 +571,10 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m,
IEEE80211_NODE_STAT(ni, rx_decap);
goto err;
}
- eh = mtod(m, struct ether_header *);
+ if (!(qos & IEEE80211_QOS_AMSDU))
+ eh = mtod(m, struct ether_header *);
+ else
+ eh = NULL;
if (!ieee80211_node_is_authorized(ni)) {
/*
* Deny any non-PAE frames received prior to
@@ -581,11 +584,13 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m,
* the port is not marked authorized by the
* authenticator until the handshake has completed.
*/
- if (eh->ether_type != htons(ETHERTYPE_PAE)) {
+ if (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE)) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
- eh->ether_shost, "data",
- "unauthorized port: ether type 0x%x len %u",
- eh->ether_type, m->m_pkthdr.len);
+ ni->ni_macaddr, "data", "unauthorized or "
+ "unknown port: ether type 0x%x len %u",
+ eh == NULL ? -1 : eh->ether_type,
+ m->m_pkthdr.len);
vap->iv_stats.is_rx_unauth++;
IEEE80211_NODE_STAT(ni, rx_unauth);
goto err;
@@ -598,7 +603,8 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m,
if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
(is_hw_decrypted == 0) &&
- eh->ether_type != htons(ETHERTYPE_PAE)) {
+ (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE))) {
/*
* Drop unencrypted frames.
*/
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 8183d3e9b25a..3f86fd785a91 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -757,7 +757,10 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m,
IEEE80211_NODE_STAT(ni, rx_decap);
goto err;
}
- eh = mtod(m, struct ether_header *);
+ if (!(qos & IEEE80211_QOS_AMSDU))
+ eh = mtod(m, struct ether_header *);
+ else
+ eh = NULL;
if (!ieee80211_node_is_authorized(ni)) {
/*
* Deny any non-PAE frames received prior to
@@ -767,11 +770,13 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m,
* the port is not marked authorized by the
* authenticator until the handshake has completed.
*/
- if (eh->ether_type != htons(ETHERTYPE_PAE)) {
+ if (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE)) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
- eh->ether_shost, "data",
- "unauthorized port: ether type 0x%x len %u",
- eh->ether_type, m->m_pkthdr.len);
+ ni->ni_macaddr, "data", "unauthorized or "
+ "unknown port: ether type 0x%x len %u",
+ eh == NULL ? -1 : eh->ether_type,
+ m->m_pkthdr.len);
vap->iv_stats.is_rx_unauth++;
IEEE80211_NODE_STAT(ni, rx_unauth);
goto err;
@@ -784,7 +789,8 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m,
if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
(is_hw_decrypted == 0) &&
- eh->ether_type != htons(ETHERTYPE_PAE)) {
+ (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE))) {
/*
* Drop unencrypted frames.
*/
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index 42a377f12857..18177f85d758 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -840,7 +840,10 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m,
IEEE80211_NODE_STAT(ni, rx_decap);
goto err;
}
- eh = mtod(m, struct ether_header *);
+ if (!(qos & IEEE80211_QOS_AMSDU))
+ eh = mtod(m, struct ether_header *);
+ else
+ eh = NULL;
if (!ieee80211_node_is_authorized(ni)) {
/*
* Deny any non-PAE frames received prior to
@@ -850,11 +853,13 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m,
* the port is not marked authorized by the
* authenticator until the handshake has completed.
*/
- if (eh->ether_type != htons(ETHERTYPE_PAE)) {
+ if (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE)) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
- eh->ether_shost, "data",
- "unauthorized port: ether type 0x%x len %u",
- eh->ether_type, m->m_pkthdr.len);
+ ni->ni_macaddr, "data", "unauthorized or "
+ "unknown port: ether type 0x%x len %u",
+ eh == NULL ? -1 : eh->ether_type,
+ m->m_pkthdr.len);
vap->iv_stats.is_rx_unauth++;
IEEE80211_NODE_STAT(ni, rx_unauth);
goto err;
@@ -867,7 +872,8 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m,
if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
(is_hw_decrypted == 0) &&
- eh->ether_type != htons(ETHERTYPE_PAE)) {
+ (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE))) {
/*
* Drop unencrypted frames.
*/
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
index dc0d9f8e1afd..e479cee5ddde 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -632,7 +632,10 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m,
IEEE80211_NODE_STAT(ni, rx_decap);
goto err;
}
- eh = mtod(m, struct ether_header *);
+ if (!(qos & IEEE80211_QOS_AMSDU))
+ eh = mtod(m, struct ether_header *);
+ else
+ eh = NULL;
if (!ieee80211_node_is_authorized(ni)) {
/*
* Deny any non-PAE frames received prior to
@@ -642,11 +645,13 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m,
* the port is not marked authorized by the
* authenticator until the handshake has completed.
*/
- if (eh->ether_type != htons(ETHERTYPE_PAE)) {
+ if (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE)) {
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
- eh->ether_shost, "data",
- "unauthorized port: ether type 0x%x len %u",
- eh->ether_type, m->m_pkthdr.len);
+ ni->ni_macaddr, "data", "unauthorized or "
+ "unknown port: ether type 0x%x len %u",
+ eh == NULL ? -1 : eh->ether_type,
+ m->m_pkthdr.len);
vap->iv_stats.is_rx_unauth++;
IEEE80211_NODE_STAT(ni, rx_unauth);
goto err;
@@ -659,7 +664,8 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m,
if ((vap->iv_flags & IEEE80211_F_DROPUNENC) &&
((has_decrypted == 0) && (m->m_flags & M_WEP) == 0) &&
(is_hw_decrypted == 0) &&
- eh->ether_type != htons(ETHERTYPE_PAE)) {
+ (eh == NULL ||
+ eh->ether_type != htons(ETHERTYPE_PAE))) {
/*
* Drop unencrypted frames.
*/