From nobody Sat Jan 24 00:32:31 2026 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 4dybNc23Frz6Q1J7 for ; Sat, 24 Jan 2026 00:32:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNb6WxBz45LC for ; Sat, 24 Jan 2026 00:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214751; 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=Idnc91h8XGyXsDAWfgCsTsBEBRBk3ilpCHOyREUZf1I=; b=qFn3wBg2oWflZDZsSzpy5k4ge0yFf0NUazYGvHFX5fUggv4OjcCER4BumcY6SNW4BaYC4Q ++76zdG4V/k2puFeWUdaWZ8zGiwuA8xsRBYzUeFHfyiNG0CjMaJqnjPkEa1qdygcPZ5fRe hlBB5O9mi5mDO6+RbjbXIi5aTW7UlZffoTwGnu93I4K6TlrPZ5nDiYfwhOSLfT+SU5W1KR UPmQ7D5eDmQa6U53VCukI1hEbjywvTV9/NfjBo5HdbXb2UBv2h18/k6mUhJNN+yoSXMkJM E6mvQWuETsc3/U3CO9mBBzCirN4v/n+ErTr3SQ+ASQA1BTtblvNUNB8gq01ZOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214751; 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=Idnc91h8XGyXsDAWfgCsTsBEBRBk3ilpCHOyREUZf1I=; b=O4yr8f7JqDlRpIAgk+X2OLe7V46Ls7RAqY9Pa8XoXQCh0MQ708IlErFT5GXlzCddIZF+zU Afn8eETGHFOYsXqV5PNgQchrZiBe78L32c/j3nfi/jppjFYwCgQ5P/sZQ8BrAeE4R9exBC 9TTzcUi0/4/RPLF3rwwhoqsYSZT8SMhUk30DHd62GUt/F0L15A8Bh8PnKSbCNla/Pr4hEK chDSLOBC+oTvL8WQee08KBlK0yqB/rlYGK5od5ucL0ukJVnDo93dCXFRnAzFUHaFRmhsm/ GGG9AUx/R/dKVV0Ab8uyu62k24T9uMyfYWnkV9DmOuh2M8kDEP4OstVoHGqJRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214751; a=rsa-sha256; cv=none; b=HQ4lvX6zmuvgogGMX0WIeLRf2fU13vY3VtNuQWv12yIzPN/19SMbthKuQ4pE0MdZWXtSrN gF1FFNr3k5xp3ToX36TKVm8k+zk0+Vu+fSegSN3ZNLt/JkYCQ6/jdUG2ztl1wtepUlFPLg XQlwGAknCj9T/LAMk7HCA0xZ1EpeXCViNYc/c2AYRl8r6OcLmhrzld27p+Cg5l0EmL7M4F fcDvUcLnmdF9UOp92Rf/t2tV4e4VIRqv2bTB3mVQk0EHeNI43y6nDAOwjmPB6Oe07kFuEa 8XdIh9DJxZuU0IXr27dE2JBTdz4mSLsw7yYVDN0X5IGrTD3BqtRnOc7HbO4Inw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNb2Q33zhvd for ; Sat, 24 Jan 2026 00:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 102400e5d07a - stable/15 - swap_pager_getpages(): assert that bp->b_pages[] is accessed in bounds 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 102400e5d07a901e0b55a3645b6708e509000ff0 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:31 +0000 Message-Id: <6974131f.b91a.1e8fee1e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=102400e5d07a901e0b55a3645b6708e509000ff0 commit 102400e5d07a901e0b55a3645b6708e509000ff0 Author: Konstantin Belousov AuthorDate: 2026-01-11 11:04:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 swap_pager_getpages(): assert that bp->b_pages[] is accessed in bounds (cherry picked from commit b02ddb59e64620733a6cbc48fb1d0583a62fef78) --- sys/vm/swap_pager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index efb0dd477c93..012d89db3310 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1396,6 +1396,9 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, vm_object_prepare_buf_pages(object, bp->b_pages, count, &rbehind, &rahead, ma); bp->b_npages = rbehind + count + rahead; + KASSERT(bp->b_npages <= PBUF_PAGES, + ("bp_npages %d (rb %d c %d ra %d) not less than PBUF_PAGES %jd", + bp->b_npages, rbehind, count, rahead, (uintmax_t)PBUF_PAGES)); for (int i = 0; i < bp->b_npages; i++) bp->b_pages[i]->oflags |= VPO_SWAPINPROG; bp->b_blkno = swp_pager_meta_lookup(blks, pindex - rbehind);