From nobody Wed Feb 19 14:14:23 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 4YydgN1mYlz5pQbw; Wed, 19 Feb 2025 14:14:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YydgM5K38z3my7; Wed, 19 Feb 2025 14:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739974463; 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=KkDjNh2BWZoEk6GtnPVpgtqaPeKn1FNoAEtZe13qBW4=; b=fBZUlrI5KxrbbpbAsGUv20ZDXqa8q54FCwvG4bK5+OeHkiCIQOXQL/PexEN3SzzMNzSCXH mDSg1s68RErjuIXRyz6EGnbAchFshpG+hyM/cqV0YLV6/rw4CyLLdYEOX4l+9xWrWviOPX w5x3WYqbkijap2g2/wQd9UgSDFSEk9uOBoyPqrp5hCPzR08oOHl4E9cIeJUiA+17hEOUIW Nn/0+/KQkmIqV7ArzYM5k/ZPN03fwA0LXkocGAQXsDFv/bQlrAwow1L7O8c8LqJOq3BTcj pJH9W224sY0MU2TN55v1pzdX7b5/jrusS//mL9ZfVgfvQtQ8+EdM5p1Pm4TN5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739974463; a=rsa-sha256; cv=none; b=NCCWY51raMAKIpR3cH2TPC3PeylE2sdl/bD6q3sZDGpxrU999TtN6YfSExvPJSE/azfZRm bIMDsbgpRovWCOerTRwy2qfNxXzT5aYcWOWM5j4PtIAdwWFbuQCpaq61zStMqCb2goI7H5 i/OUwFCcgYpLDA63XA4KVRLmx3X0ZuNeujl0ppRwnzLZPUopbYqPRWO2s0QZocCAJ3uqUn Qx0tcA/t14TvxwYRwSuE1ipiXmAWuFhraD3jWZ88X+SzrCSLK5IkidvE3CRScOfDmIQVWX w9YWVCUrgylYLeyyQy126h30Ks+t1H2mWeExtHZ7MS9s4OEjtvi8wDFkLZ4wPQ== 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=1739974463; 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=KkDjNh2BWZoEk6GtnPVpgtqaPeKn1FNoAEtZe13qBW4=; b=TfhUZIUj66Oe6rUUnMaPmcGCh4+QTvWpuTNeaywaup/zUsqrzCDQ/7CYBLGYjvH3VWDI9A 6ozwotOy29/CD1Nix+oCiJGpgiR8tu90NPO2TL7chDKKskykycg7neB1LPVs+RR3B2PtvO Xv96m2DQgE1cGgSKiMHSlshx0TbOYl0qJaYt4hwYzu+2w3fxSuWTUD/sesvNQTiwOKowV2 G2xQNHXLDO4jbopV9+B2q75Wwsiz0A7ucg/H6jLQUnMBUJa8ZDoe1yVi8NhNtc+inOLzEt dF5FVo26ya3TLX1+7q9GPGtH/4Ks6fMjsm4EiGMBHLP39BY8Kyom2pqSGxafqw== 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 4YydgM4vnLz17p2; Wed, 19 Feb 2025 14:14:23 +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 51JEENtm038159; Wed, 19 Feb 2025 14:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JEENNH038156; Wed, 19 Feb 2025 14:14:23 GMT (envelope-from git) Date: Wed, 19 Feb 2025 14:14:23 GMT Message-Id: <202502191414.51JEENNH038156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 291b7bf071e8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 291b7bf071e8b50f2b7877213b2d3307ae5d3e38 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=291b7bf071e8b50f2b7877213b2d3307ae5d3e38 commit 291b7bf071e8b50f2b7877213b2d3307ae5d3e38 Author: Olivier Certner AuthorDate: 2024-10-28 16:22:28 +0000 Commit: Olivier Certner CommitDate: 2025-02-19 14:13:27 +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 --- 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 3b3b3cb16bb9..e2b5a6e21365 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1782,12 +1782,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[]"); } /*