summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2017-01-25 09:23:09 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2017-01-25 09:23:09 +0000
commit83412cfed8279a5b8d5f7d9b34588dc0079d7bc6 (patch)
treea32ee6a89938948ab09cb2aff2cdbc75c1ffaf36
parent9afb470771d444a374f28ba323fdb566d0a7f330 (diff)
In amsdu_decap() check the actual length of the data in the remaining mbuf
chain. Else this function will sometimes signal end of AMSDU frame too early. Patch by Imre Vadasz. ok mpi@ phessler@
-rw-r--r--sys/net80211/ieee80211_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 8fbd2c92fc5..e780b2c6ec7 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.184 2017/01/16 09:35:06 stsp Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.185 2017/01/25 09:23:08 stsp Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -1096,7 +1096,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, struct mbuf *m,
}
ieee80211_deliver_data(ic, m, ni, mcast);
- if (n->m_len == 0) {
+ if (n->m_pkthdr.len == 0) {
m_freem(n);
break;
}