From nobody Tue Mar 15 18:14:07 2022 X-Original-To: dev-commits-src-all@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 049BB1A22DDD; Tue, 15 Mar 2022 18:14:09 +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 4KJ1km3HtLz57LM; Tue, 15 Mar 2022 18:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368048; 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=ZzQFmRqvL4hskwr4e63/7WXcJSDiiD+mPXT04itZDGE=; b=v8SJpKFeSYEtm5nxGli5Sg1hqDcrC/XCz7vxLUl27nbyrNYW3svZtOsbeeCY7lK6EBrTLL nfERg59wNbdl1SfjAE0W0sc5AQnedoNjmzQHsFfHoggYYX3CrASIxIzyIl6WfHfCemm2wb mlAJNv7Tb6qcBvfve2TnG32XmUulCxPPM9mkXDh8Tnr9w4+HKu2+gEKij66CeFX09UANLA 0BWKiCHp/eVhANQNKN5IewciwsKcicTY0xIS75CGOA7o1yAbL/HQqPcC3LMBRnbEw7RDLd TCqURbNrA4viFj/CDnPgGbkX11waGpnviEl7yuuYqE4zEUg/Xu34LExMwLSalw== 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 1CF8F268D2; Tue, 15 Mar 2022 18:14:08 +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 22FIE7Xb075006; Tue, 15 Mar 2022 18:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FIE7Ai075005; Tue, 15 Mar 2022 18:14:07 GMT (envelope-from git) Date: Tue, 15 Mar 2022 18:14:07 GMT Message-Id: <202203151814.22FIE7Ai075005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0d1db5c3257e - releng/13.0 - net80211: correct length check in ieee80211_ies_expand() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 0d1db5c3257e7cd1708b21dc4c6b14c9b1a41ec4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647368048; 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=ZzQFmRqvL4hskwr4e63/7WXcJSDiiD+mPXT04itZDGE=; b=FjoAjIl7qj+PwNkbFRZTiSJZ1w5I2ikw3Uyh5zIJ6EIT5US+8z5ryEe+OJyrKrrCLDLgQk nPuHxnMGH0+TuEa+2/gFm8WBkLA6JTVY9bqchjV/91hycNPVlro3Rn+hSv2B6L86UKcQQE 0q7ZPO/ceaoqqRNqOxg01Bl74lwEey0x2l0LBiAxHXfnjn1qpeOhb13u8CZLf64DdYzz0c wZ3ipV3KF78xYQXLJRLeNGZtF2lRMBm6Rxsx4eDG0Hn9eYTlV+x7Xvh8wiBd6tYfQHgFyY pRUubam3gXxJgBPVhAw5rVRKMIZ2zFgXP7vcfVcnzFNC7dyRFeuTaSlVAhREJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647368048; a=rsa-sha256; cv=none; b=Z+C8de/HLBbvBGTm4rNCI0Cy/QcKa/INHhi8Tt+vWIx0o3t/82d7+OEOpwF1Dy2HADEaEx dAHUHF8twFL3dpf+sjy0Oa+KMXrPASCjnqSgfj9WFTQScoC57aWsMF0wOkurJ+YQmUH762 UGN++SXaOlFMj80ECRZuDpUHcaplKV5QdGEvkN7Zx9RHdvgNkdlGzkGnwkyngcrqCUDxFZ u8uxbBD9qbWExxoDzDeje/vfGI+o/k3ctvYVCvOmRJzbTiUEmzVKZYp3tsEerF+pg6oCMc OMbJsGLAvkSLuW39eJHk4xpup7FWpWw3juNz1whsRBzt1SP60g/p5E7r+iKUBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2021-10-06 18:09:39 +0000 Commit: Mark Johnston 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))