aboutsummaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_adhoc.c18
-rw-r--r--sys/net80211/ieee80211_hostap.c18
-rw-r--r--sys/net80211/ieee80211_sta.c18
-rw-r--r--sys/net80211/ieee80211_wds.c18
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 75fa1c0f7b31..4fa9c6a72145 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 60a5ea100556..cd62266ab942 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 f88871ca4ae6..b73988b10d5e 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -634,7 +634,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
@@ -644,11 +647,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;
@@ -661,7 +666,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.
*/
generated by cgit v1.3 (git 2.53.0) at 2026-09-05 17:49:18 +0000