From nobody Tue Mar 24 06:03:54 2026 X-Original-To: dev-commits-src-main@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 4ffzxl1895z6WB25 for ; Tue, 24 Mar 2026 06:03:55 +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 4ffzxl0Wtxz3Sx9 for ; Tue, 24 Mar 2026 06:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774332235; 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=Yet2W67GmkjtFA2g0e2lRP6BEAwrrlfHXixZexlZszo=; b=DnLcZvFPmbT8Gf8hBoj+6EJVIgJivstVE+GEfkWHkMWukzNCaQWm52fwWWoWBMpkE0HxlM e5MKsfMEg2ppkB99HLBrSV43qRe5VLnphJbkIDXOtyZKXEv0fufNZ5p/Iu9XpDdMNYPTMX 7o3vJcJBIu6uqYE23P34U+3rRXEv7OsyIQ2K5e2n4//WDmp1qO1pnM9xPZwxe/J5XVaNgb 5lA05h3IY/snzdS0UevM/iKDe2GQN/c+pk7MI4d8mp/8xWhbsBl+3dF1/SsgfdQuIku5Xc SsRP69e2J2JpaxvzPdkm9gzySnPM7TzmhF/1nI5PqYoTA/x6m8UwCLxuome4Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774332235; a=rsa-sha256; cv=none; b=WvTLYzgEYkuGoveFonJvjDluzjorCHa8CmJFTcU2HZZFLEr2HNl2ltlKMfw5iLj3BQXfSm jVY4NqK+McQ0M9wqEcWEeg97wBkt+XFOkvs7vN3aDt9DX5vaBgNBvAnI89P1hF/I7iR2kg U4XRZeuVAx0rpf0j1UzKLeipZjT6jCLQQPftKvBCxX8Xcfi59RlIqgo2RL/94Kr9+xMivE s0VXIKAi6TvtnDo76fLvB/v7YB5coxYvYVASSV63Rz5RoEdVHqlDVv+OabQdv1AkaUGwi8 /SDeYJLTPIfYXnhml/W81/yZkCPD+PjdlAbGWDPhHrY5rGdgAtj48EmC9z+NrA== 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=1774332235; 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=Yet2W67GmkjtFA2g0e2lRP6BEAwrrlfHXixZexlZszo=; b=NXakpVfa4GUZd/iSPM5FqSJYHCNguC+v/GKbVPJRriAbEyRVadl5AD2Rbx3E+oHgiTIXyj YzeDmGF/DZotFYE/RxHtKrBdh0eRyGK7HX9mV16ZqzvS2yC005KWYXy3Mv5J3ObOXxcQkO LDfd6Fv353vujA1m1FHfRWJ4m0pLKCNpAXXQqfXS+234R/6CmFQL8nysTs83atYJvEP5oQ hp3VpO+SqCtP/9lx4FuAoPMlUimuRtKeGxfTS8g46Eet/jLftEjGNe4gwrsUwxNckXfBA9 1dh/mZNodAICZkRY/rW95s89TfbueEcxCglOLmAOi7oBaVRxxvx4nQdlpVDdfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ffzxl01llz1LJ7 for ; Tue, 24 Mar 2026 06:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 06:03:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Michael Gmelin From: Kristof Provost Subject: git: 1fa873c93c8b - main - pf: Fix hashing of IP address ranges List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1fa873c93c8b08561c53107c7b90c53dfad30ddc Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 06:03:54 +0000 Message-Id: <69c2294a.3f5f8.2a9a0f10@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fa873c93c8b08561c53107c7b90c53dfad30ddc commit 1fa873c93c8b08561c53107c7b90c53dfad30ddc Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Kristof Provost CommitDate: 2026-03-24 04:27:20 +0000 pf: Fix hashing of IP address ranges This corrects the false detection of duplicate rules. MFC after: 1 week Reviewed by: kp --- 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 12a2189207f1..fa331449fcf9 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1359,6 +1359,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);