git: 09dd08f16781 - main - net80211: correct length check in ieee80211_ies_expand()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Oct 2021 10:27:44 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=09dd08f167812a5fdb516fc98f14dbb43221432f
commit 09dd08f167812a5fdb516fc98f14dbb43221432f
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-10-06 18:09:39 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2021-10-08 10:26:22 +0000
net80211: correct length check in ieee80211_ies_expand()
In ieee80211_ies_expand() we are looping over Elements
(also known as Information Elements or IEs).
The comment suggests that we assume well-formedness of
the IEs themselves.
Checking the buffer length being least 2 (1 byte Element ID and
1 byte Length fields) rather than just 1 before accessing ie[1]
is still good practise and can prevent and out-of-bounds read in
case the input is not behaving according to the comment.
Reported by: (coypu sdf.org)
admbugs: 857
MFC after: 3 days
Reviewed by: adrian, markj
Differential Revision: https://reviews.freebsd.org/D32340
---
sys/net80211/ieee80211_node.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index d71503d28179..95bed7821d16 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1133,7 +1133,7 @@ ieee80211_ies_expand(struct ieee80211_ies *ies)
ie = ies->data;
ielen = ies->len;
- while (ielen > 0) {
+ while (ielen > 1) {
switch (ie[0]) {
case IEEE80211_ELEMID_VENDOR:
if (iswpaoui(ie))