From nobody Wed Mar 25 10:53:58 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 4fgkL42JKjz6W5vt for ; Wed, 25 Mar 2026 10:54:04 +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 4fgkL40mNZz3MGf for ; Wed, 25 Mar 2026 10:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436044; 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=AoEbqQsv9Tezcr1aVkNIJh3PiY6aL8evJxSk9XvT6/U=; b=ZVVd45sTq06CWg2zHT/aWK6sbDRVYeRAcPf8ud9uBy2SzzMCu4xKHUono1f/BlUreWRdV8 SMugcRswi1/5sr0+/Z2p094a7YcJMJRdfoSAOltyS8RKDYLcAObaR7s0pVsIZPMLEBl6I3 I3RE6lDKFgwrvfT+zCTfSh9ElmcLJuYxNdiiXodgT9jnOWyOKj4xCLbNIMXHKrlwZ+PJym y3oRfVSVqQ+pdQiAmkcUTvMTEIdowmLpLRjXwb2v6X5CrCl/bLfwSyBeTCpLYKK/80cBfZ VCelsSZ8X1QoCkg5DeY6jlDne+qxRyDw/NSmFF58u+pkYpsz/wPms8VXEdy9Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436044; a=rsa-sha256; cv=none; b=bnoHb0gHJ/qSos3J+TVIXNw4zEJD9sue0dPP7f1hi7j9cABCBOYZ7nUmZeL/WosDp6AmDl VoCtydnqM45HQoJcv6qzDqjat9BCkP2q+TUkV0ui0k3ZaNxIEaBAHEl+4k6Z8kJ68LY5Nz 0thv74y9trmWikKtT6cNm/+dFAdTVdaZzU3n0WDvOp9k+m/MJQ0bKLHqOLCRj6gChdGVxC QSF3fvD5/2UYhxoUnKLtBNsWUIz3F8BponjRx7PCHnLjQSy7xsaqazb/YmjXT+Aq/JO0Sx p3iWYFZbAMVkdwj4k1PKXzno5rE03+zXv4J9xxrFKOZKbANRy91axTCYgO0wYg== 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=1774436044; 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=AoEbqQsv9Tezcr1aVkNIJh3PiY6aL8evJxSk9XvT6/U=; b=kytdRQSMPneNw843lqWWmZpXcaO9y5ljpcDR+thYZ6NBTJli3S5RMBlkI3rj5qKe8JQ4X7 s3qAbvcTbHTqkNCScMWIyR2zo+jC33Wo5szXiiEzrR+YrmBRWsbybvc5+kQLcxswMRJOfS 5kJUn2DZA9derGUBpaVsjrJBJuSDzDz3a7fk4Z6Hj3iru+ulr1/DhgzhIQ/HCU1zpWOKRt Xz1m5G+Njl84+BfTb19yPz+ZJbLI3rVkSEgBwdt5RzdtFZPuysq4D0oR1p+7T/2uyhwOKU n0WkapcX0EnBfw4QH7QalHjljSqX/UbJrehhdFZMFW1VtQj+aJOGSpXhpoczdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL40KQ1z12hX for ; Wed, 25 Mar 2026 10:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:53:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Gmelin From: Kristof Provost Subject: git: 38f8ac568273 - stable/15 - 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 38f8ac568273fde3f41582c6bc01ea4b2c9dc029 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:53:58 +0000 Message-Id: <69c3bec6.370ab.26d98a24@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=38f8ac568273fde3f41582c6bc01ea4b2c9dc029 commit 38f8ac568273fde3f41582c6bc01ea4b2c9dc029 Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Kristof Provost CommitDate: 2026-03-25 07:11:57 +0000 pf: Fix hashing of IP address ranges This corrects the false detection of duplicate rules. MFC after: 1 week Reviewed by: kp (cherry picked from commit 1fa873c93c8b08561c53107c7b90c53dfad30ddc) --- 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 d0fd6476727e..915a09a05297 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);