From nobody Thu Mar 26 01:16:03 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 4fh5Sg2ZkZz6X3rQ for ; Thu, 26 Mar 2026 01:16:03 +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 4fh5Sg0gnBz3LVZ for ; Thu, 26 Mar 2026 01:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487763; 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=/1pyFGkxjJtVjycrPgdNjZdJWTQZgBQWb805IbalEQU=; b=TykLk+Nl7DsigNLvTVmFUBIClF/GIxjjNHb283SiwxZ9Bx1ScysHHHNVQDY9HNWOslX3HI C0+jPlwelDCI4lOqDyxGl1xzuGEkTGYS9/OBOVlGzl8GGTCO1wKHEYDmwr5tlLKN0GBDJn b/AC1jrULOqEuIixpzsNhCCeBXmMeqU0fpPPMM/O1CeFjx1XNKKATajs+O9/moyQJtGEUt ZvO+zAFy8rUalaOshxMB2Wfx8yVD3PWsLWvyEavbFnxYy82b2On/bONvMRDkitpr4PnthW xorkD3BeI2gpC7sENeHl008HftccQ6R8W0DkBMx9BuAVEEotlGgWj9MZGzfcGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487763; a=rsa-sha256; cv=none; b=DtYzsn6emrcqLqFmq4kiGP7NEQ98m2lrqW9BOQSByeNMQAUYouRjjUVz0dFCWeC7eHjbaH KHtxH7gs9ap8u806qhawNcb+b/48gaMePAyZjs6NDiQNSzdRnQcevUE8vO1cQ/E2xkCWO7 xa5JxNXIm7/5+e/M+tJ5OQPfR4mTNoVRn0A+Pxxrs1VwjbCUjyUcHgRPcs6z9+EUiFjJQ3 SCnDHOOTymnaf/Y0vUS/0cKylRSyIkJwIjHMkkhJ96Lhb5yT4UAwMIJCJkIONe4Y+7tS0e wbBn6wmMZE6Uo3hZwUnbld4vFMn+7YtG4vxWaEaPxKbHmvLkYauMgK2enJxYag== 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=1774487763; 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=/1pyFGkxjJtVjycrPgdNjZdJWTQZgBQWb805IbalEQU=; b=GDk+t5DJePpClKJzevePFFDk3LsxQB5bEJd1XP1rjJPgIDeF02pqchTJ0l3xPvyRcUPo2Y WXDt0TU5qseX6EVL8KgDxmqcmJFSjyUcuYG60sG/E6utduBH1VFJPINVkvqHAk7nsfEdpn sJLB4zBp7qGEdEJYbZyv8mCmQ8KRtr6C5yLhNsdWLudngM5WSIOUuT5NJaXmzhm+UQYbxP xIygciMRAY0SQuZ2+cdMV76d/kpLen03u0wjfi2DXjJrnmu3gD2mn6+ogeTDU71Un/DghJ b/0aAJD9x98tmzfel+3A+zcAg9WxaihJhTh8JvBaPJ3o/BYestXmiRq1Brhs3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5Sg0BDFzVMm for ; Thu, 26 Mar 2026 01:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1930d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:16:03 +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: d3c0dff16c2d - releng/14.3 - 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/14.3 X-Git-Reftype: branch X-Git-Commit: d3c0dff16c2d1f871b9fe26234df986c85823f6d Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:16:03 +0000 Message-Id: <69c488d3.1930d.b270053@gitrepo.freebsd.org> The branch releng/14.3 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c0dff16c2d1f871b9fe26234df986c85823f6d commit d3c0dff16c2d1f871b9fe26234df986c85823f6d Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:13:06 +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 ac6bb58a715eaf0afb7a80dc87083f9819e10ac1) --- 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 d95f36d06ee3..898bfafcee21 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1264,6 +1264,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);