From nobody Wed Oct 28 16:10:31 2026 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 4jFC591nD4z6xh38 for ; Wed, 28 Oct 2026 16:10:37 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFC583bqGz4q5p for ; Wed, 28 Oct 2026 16:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793203836; 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=aOxSp3jfmS5SnY3GeouP7NAEzoqSZjyWZCgm0Z7hHH0=; b=wCWWuhvJ3dc/MjAkJd1PZ6BsiSRli9WvGLarw6NsCWv1y/LVQq0K3s5wn7+3DXpHm+9s1b HSd2gQb4qpa1RlXKG9tgosICP1uFy1G5SIErhpXYc7yyvYAtXfyo+DAviDu3HbAvauBqVe kY8EupzcdY7VPkyzhlyNAn4ZPkwYgJpwfwvBndNV+rfxOgkupLX+EjrOiHa9BVoOgVOZlj TR5PeosUI8qV/xsWk7YNNb5fFxxXHxg6Nf/Flr6P9cv4iql6C7oPAkxLod8hGiMjWT9fCV zJ2QW1HFw0FixEN+CvskoDPhShlf36gS1NarIVw99eAzHRqRUFACpZOcz7+ddw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793203836; b=WTygCbMlWLEMy6c2c6KQ76LBs+w/m0rp8kUUxx0CFH2119K4aFJJLDVpaWX3XLwvVJMCUO ifJxIJgO3vaq0AcH5cfU+jMfkknrPMu9SC4bTP+c4aFmA1BZS2cDSTY2ZOMOQUBIE0j7cK wvR0mhC3Md3BIiod0HJNnZtHhojqEegsf/hcLpSUaleN6ar2b09PcxbNNzCP2rtz5lSHBa B7Z9/BH1nK9v/gvCRNR/Z3kH6bXFUkUtZOXCM5rTaGjDg5S1OwNgfHR/6pdTsmvdd70Rek TPgU5MQSYrd82HDCrOrDMo7wi5MLxft4O1PxBzw7mq/qVrwalUG0Dsn+133HMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793203836; 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=aOxSp3jfmS5SnY3GeouP7NAEzoqSZjyWZCgm0Z7hHH0=; b=RcCVEXQT961cKqs3EAo2cwud7WazSeJztLn+NHJExxq5q9veBuPW7IcLV8BJlA/wX0jd7h q27vT8pSmhJXcxqEtUu7ApsdrycKJz+iuCVp/u5RrfJ1r87mU2cfif5SQPmedkrQ271Qj7 dBZMGFiLmtBCkv0nLSDbt+ndiChVrddq1nUuIUOlOjWMDOYDDTLCxZWAeDkfoqxm3gZkLv D45KDirXJOfFLM7FY3hZ62E28Z7eIkKzKXPxT+FiInYvEFl9lK6HBIgOOh74nRj4TPP2cF URul4/ok+EtCXvaz7aRfgfKcNxymM/tVPcVE/37UJsosxPiutLiY8VC8ZK+KJw== 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 4jFC581TNMz1DyM for ; Wed, 28 Oct 2026 16:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 16:10:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 06f98c554fbe - main - pf: Store the rounded source node hash size List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06f98c554fbe1fa9a678aacbcf1bc25bda0aef91 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 16:10:31 +0000 Message-Id: <6ae21e77.314ae.70ec8bbb@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=06f98c554fbe1fa9a678aacbcf1bc25bda0aef91 commit 06f98c554fbe1fa9a678aacbcf1bc25bda0aef91 Author: R. Christian McDonald AuthorDate: 2026-10-28 16:10:17 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 16:10:17 +0000 pf: Store the rounded source node hash size hashalloc(9) rounds the requested size down to a power of two and writes the result back, but pf_initialize() stored it into the mask, which the next line overwrites from the unrounded size. With a net.pf.source_nodes_hashsize that is not a power of two the mask is larger than the table: pf_hashsrc() returns rows past its end, the row walkers in pf_purge_expired_src_nodes() and the ioctl handlers run past it, and pf_cleanup() frees it with the wrong size. The key and UDP endpoint hashes already take the rounded size. Reviewed by: glebius, kp Fixes: cd5ff4e841fb ("pf: use hashalloc(9) for key, id, src-node and udp-endpoint hashes") Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60949 --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 94985f47677c..bbba67529d09 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1583,7 +1583,7 @@ retry_waitok2: ha.mflags = M_WAITOK; goto retry_waitok2; } - V_pf_srchashmask = ha.size; + V_pf_srchashsize = ha.size; V_pf_srchashmask = V_pf_srchashsize - 1; /* UDP endpoint mappings. */