From nobody Tue Feb 15 00:56:00 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B9B7019B69C8; Tue, 15 Feb 2022 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JyN1r4sBjz3n1H; Tue, 15 Feb 2022 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644886560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsbyZpQDtuuO7sUgSl3Zcj7i/FToyWrEZ0Qi3sJqgnI=; b=mBfZolg9PRA5pPP2g1U5/umO7fOb4gYuRa4X1LM9OCgBz43cpIM2YNYhGNu/MvzNZuWVzk qwhcprG4Tmr8Z/EoquSAwi64AylNWideYP4mzyQOErRLr8ryDVklK0CWOMeEO3Np+dRMrd /QHDKq5WNKYHrIcAeU7z8BC/Ljby8Gl57ddKgQeBstlWKgiBQzANn/pVPjszRZ5XVn9SSr QcVVjr/zaVrrzsxyo3H4+hVMKCQ3wKtFq8eQjza16+dyVWAVs75cpz+zIa77xNC+2+KttB 34qB4aXQJc/Jrbci3MyGPkkUgcPUpujdUBN9hQufr5m3pTDzD0toMmMcGD8LUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8252E18AD0; Tue, 15 Feb 2022 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21F0u0Cj052672; Tue, 15 Feb 2022 00:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21F0u0bN052671; Tue, 15 Feb 2022 00:56:00 GMT (envelope-from git) Date: Tue, 15 Feb 2022 00:56:00 GMT Message-Id: <202202150056.21F0u0bN052671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8dc4c0a922b7 - stable/12 - net80211: correct length check in ieee80211_ies_expand() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8dc4c0a922b7e7a0ee682f4e1426f876692c0828 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644886560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsbyZpQDtuuO7sUgSl3Zcj7i/FToyWrEZ0Qi3sJqgnI=; b=MRv0seKFtgVOWHK13h9E+lkXnsifh5GxJi/hCZi3/LeFw9AsHrj2c0oZ64gCP0h/jdioDu 35Fstz/05GeG86fMDLMcbD3pER2zh6rNuvs5ucFA3ByYZkxAQulKItd8HR67joI2c+77AE /gs742BfzW+jW/FaP8jfIA0u4TT31EWs4eRSqpvyBRUirVM76igkGhgNjAowOKU19+iKJu YhiNfq//2/Z2q0UMknUbc74PFOPMM1Z6NlD0YkWY9E8USPk7DItCPns14cLmXJkL4/sTCG jq49AthGBB+i2O6hDfqvYMMNX7+sO3zNWE471jugJH3N7l63jUSwOSSRyZ3pTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644886560; a=rsa-sha256; cv=none; b=wVE+9WKyt8QhpsgXX3HsA2azVe8azY9vecd/mO4s7tE/7GFBpak2IXsxsYW7piXGpAIyKa +M0JxqUYiUtsWvgbu6wRSr0RfRNycjHyqcFaD7s1EjzxUtCDCgI+lza8bRg/FywOYLuo0v cOxqRBFHKjwMF3BM7bJB7tN6662DIobPskNXcuXS68pGndUy98Eq7gCGS5nLS7mAkVBvYL wX9wJ1v6CEU+hvXdxnvXUStPvm6Q84iJlcZCfYaklqG480zV4oPbsm2fBcWXam0v/PtQgp qXmElhZgw/KgOqfNC5hhdnF08uOqC583EhT4cBoB6Taw/RwASxh/1fOBQAY5Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc4c0a922b7e7a0ee682f4e1426f876692c0828 commit 8dc4c0a922b7e7a0ee682f4e1426f876692c0828 Author: Bjoern A. Zeeb AuthorDate: 2021-10-06 18:09:39 +0000 Commit: Ed Maste CommitDate: 2022-02-14 22:00:13 +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 (cherry picked from commit 09dd08f167812a5fdb516fc98f14dbb43221432f) --- 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 9ee5b1b83cde..36dfea039df1 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1134,7 +1134,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))