From nobody Thu Mar 26 01:11:21 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 4fh5MG0s8qz6X3sS for ; Thu, 26 Mar 2026 01:11:22 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fh5MF5sj1z3FJl for ; Thu, 26 Mar 2026 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ikrq99mOtwhHT11M0d2JZapOrUDVGqNcVX+jlaex55Q=; b=cbpfWygNatVNCJxyH330Yh77pLC2bUkDrycYvuITwfL9Oi+QAp6QX2UBLYw2wkRAk3udVp NHNNDundNS9Sy7MYCUzJCmcTKIe+BPMXL1uZYbPS1ZmRqT5PeKqX8NTuKFP13Jrtei5zVa 7OGEaLCruu3aNn2Met37JmrcWTpiwAMEEInxemFJA//gJ/1p2/N3YYKT2dN9uBH3FRhFg3 P3Sn18sud6XAR4srJELQHUZGK9iqDbrzzGuZ+8fMMmEk0aGqIez+I7cyi9srrL9Sz6fIet GCy1mz262ZV2DagTm3ULPPB/RTliKS3jepDxwWpZo3lu0qinGBYoHzZCpW/3Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487481; a=rsa-sha256; cv=none; b=Rr/Nstotz0cHKTrqfc2svtEl7BVuQbHCeXJnIqn9A2ZfJAAESaVceHN4YnyUD0m48Eu828 4PsBVZLFwZgHfreYDUEcEzAr/2wL/2yMiSktE2hobjQV3IqM/frqkUjOe0uHI0gO5z9vNZ 7dHGY85MYqINad9F+kPbrh0b9uJMMAHJttjwRxTLz/DhZ9pOEWtkQaikREfj+Kl4dsytSj QJySGc8Wdl8xXcdzYA8XzLoFAXHOB96cbaNmn3ueqF9nOvQJqzL8vmpKzU+eLsChh0foGr 8q6wU+YRU1BX78jv3Yi8bxb8oXcwoEpAFVnycE4DGLJ0DhP2oBmO0gtriBcKzA== 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=1774487481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ikrq99mOtwhHT11M0d2JZapOrUDVGqNcVX+jlaex55Q=; b=kjTn9/bMGe1Ip/ILj4QuMLEXBaqYj13BBeKPcbUOAu+hVK1Z+X2Cduk+6HkoNy7730+/xa gOaxvFjwV+5R93oFJsu4At6bpED7aqUFRJZYiI3OvGt4i4ddabbDc/Dd1kuFISeGeahYI2 MInlXrlAXIdYCoE4qcNWonNWemLBgUTMSicGgCPtZ8r52kt6EHs4hQAo9WUVrfRfvO8YXh gQd7loa9DV08/zoMNB5aUSUGEzwrs8PU1FGtWAU6usqF8DVOG2dbVy3J8sIh0+7PLIiWWj 4U1gRi+o2ztir0LbCQ8ZMMOqoABel74ksVc7McYzzZh81CzV5qJCW7IBKoWL7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5MF5K49zVMg for ; Thu, 26 Mar 2026 01:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 471c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:11:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Gmelin From: Philip Paeps Subject: git: 797bc7cae35f - releng/15.0 - pf: Fix hashing of IP address ranges 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 797bc7cae35f7e6ec59baba04a951150604e0431 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:11:21 +0000 Message-Id: <69c487b9.471c7.43d0180b@gitrepo.freebsd.org> The branch releng/15.0 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=797bc7cae35f7e6ec59baba04a951150604e0431 commit 797bc7cae35f7e6ec59baba04a951150604e0431 Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:05:34 +0000 pf: Fix hashing of IP address ranges This corrects the false detection of duplicate rules. Approved by: so Security: FreeBSD-SA-26:09.pf Security: CVE-2026-4748 Reviewed by: kp (cherry picked from commit 1fa873c93c8b08561c53107c7b90c53dfad30ddc) (cherry picked from commit 38f8ac568273fde3f41582c6bc01ea4b2c9dc029) --- sys/netpfil/pf/pf_ioctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 856bbd6cb9cb..f924bde141ad 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1350,6 +1350,7 @@ pf_hash_rule_addr(MD5_CTX *ctx, struct pf_rule_addr *pfr) PF_MD5_UPD(pfr, addr.v.tblname); break; case PF_ADDR_ADDRMASK: + case PF_ADDR_RANGE: /* XXX ignore af? */ PF_MD5_UPD(pfr, addr.v.a.addr.addr32); PF_MD5_UPD(pfr, addr.v.a.mask.addr32);