From nobody Tue Apr 08 13:40:40 2025 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 4ZX6fL1Lttz5sQFw; Tue, 08 Apr 2025 13:40:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX6fK1BhMz3Cl6; Tue, 08 Apr 2025 13:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119641; 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=URXLDu/ecdee+3Hx7ezvyGSjB4BNKPNA1AMXA7JlqIs=; b=KMMxt/AH+y5wWyCinbifsmUQ2Vp4LyjXkq+h8L8aaJjBTAugpgYkW8ddioHpQIwLnp+cv1 t/xNxhIWoJcx/wil2jLu5569hJp9dQcwX81Zs7oHC5aQXuNkKsLvt2IJI9sFd9V6miGk6l 2jdc4L5VHg+F+D7y8IvmxAvGKfH0JWwFvgkK3KPMioqznwudYFc295vjowxIIwEIj8ZSHv qSaTV/Poer0WQyRfJFBkIQBCTpF4FuRE1KGXTnfQureCUk0olQc1qJsQg2g3z2h1J/wZ92 krdGq3ikf7eIm3UuUrE0bZ8xntC17WWOXinf78hTXCtGpuu3Y9I0GrrfWMvtaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119641; a=rsa-sha256; cv=none; b=FWpGb/n5L71M/tUUD12L0aMnxKdMi6npZWV2Y+E9jAwTrZ+yZ5uSINnI1j6W8OuyNjfuC2 JEPJW5AyOXm0Jx6uEBo7ixRbxn21wYdPbckVJ9GMr2/gzIVBFBLoxxZX5Wmj+gvQz54GAK dwWoCbh6redD6lq7meJJofwqqTWfb++NVU73HywiJ7BquMmLnBN6uCrTRWiVUhIw2lYVY7 nOVGSVepvsFgQDtl5K1SZxHPdPJ534T0+9Rek+H0L5ed5OMNUgCgYcrJODt05OqKToC/nC eC362XTuhv6EB3+1JW901KrT01rXnbj/PzNaj2C20b0ZNDMkwzfmI0Q2ar2K7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119641; 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=URXLDu/ecdee+3Hx7ezvyGSjB4BNKPNA1AMXA7JlqIs=; b=Y35/W3tsQGtUZx2T9kh98CEe9mGF7PDfRjYOHWNNkVfEkgNYPac7jdKf/vnmN7g/h50oCC WSQ2eEh+oXR4Sev3EZTQEOc3kyzMTrSGIiUWW83ZeyZRM7MLzP50muLx4SMEDWR/vfKwok 4nhSbn8vZibjd05pKH8mapAiOUoCkp3EXL0IWDj8KGMcfbSjYz89D7461X2oIKM4V4rn+l U+vE8G7u9amgHYz4vmL7TvE1ycO/uEi77ya1iqUFacrYGy0Z+C/MHsvq/sIFro2qrvbd+v ul+ugw5sS5xYkbnO8mLd+WB7eN1TGlcoMTVlE0l6RXJunDmn2yCTL6UI+h5DSw== 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 4ZX6fK0j9fzb61; Tue, 08 Apr 2025 13:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538Dee2r030688; Tue, 8 Apr 2025 13:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DeedU030685; Tue, 8 Apr 2025 13:40:40 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:40 GMT Message-Id: <202504081340.538DeedU030685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7658c4f8c727 - stable/14 - vm_phys_avail_count(): Fix out-of-bounds accesses 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7658c4f8c727e3f646e49824e2ac5ce2372af897 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7658c4f8c727e3f646e49824e2ac5ce2372af897 commit 7658c4f8c727e3f646e49824e2ac5ce2372af897 Author: Olivier Certner AuthorDate: 2024-10-28 16:22:28 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:21 +0000 vm_phys_avail_count(): Fix out-of-bounds accesses On improper termination of phys_avail[] (two consecutive 0 starting at an even index), this function would (unnecessarily) continue searching for the termination markers even if the index was out of bounds. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48629 (cherry picked from commit 291b7bf071e8b50f2b7877213b2d3307ae5d3e38) --- sys/vm/vm_phys.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 3f8c37b4c2bf..34a003fe0ab0 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1599,12 +1599,10 @@ vm_phys_avail_count(void) { int i; - for (i = 0; phys_avail[i + 1]; i += 2) - continue; - if (i > PHYS_AVAIL_ENTRIES) - panic("Improperly terminated phys_avail %d entries", i); - - return (i); + for (i = 0; i < PHYS_AVAIL_COUNT; i += 2) + if (phys_avail[i] == 0 && phys_avail[i + 1] == 0) + return (i); + panic("Improperly terminated phys_avail[]"); } /*