git: 0d1db5c3257e - releng/13.0 - net80211: correct length check in ieee80211_ies_expand()

The branch releng/13.0 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d1db5c3257e7cd1708b21dc4c6b14c9b1a41ec4

commit 0d1db5c3257e7cd1708b21dc4c6b14c9b1a41ec4
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-10-06 18:09:39 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-03-15 17:45:36 +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
    
    (cherry picked from commit 09dd08f167812a5fdb516fc98f14dbb43221432f)
    (cherry picked from commit 32c2c00e3f90d3a01a03ebdf7131c7e300da034c)
    
    Approved by:    so
    Security:       FreeBSD-SA-22:02.wifi
---
 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 64a0164aeb81..423d701743bc 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1132,7 +1132,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))