From nobody Wed Mar 25 10:54:00 2026 X-Original-To: dev-commits-src-branches@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 4fgkL10qrxz6W5vV for ; Wed, 25 Mar 2026 10:54:01 +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 4fgkL06vcbz3MZn for ; Wed, 25 Mar 2026 10:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436041; 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=NvqiNNr5PVFrLwyD7MainJ/hR2ejPDS74qRL7m7b8xU=; b=MUizX0Us8fN6yUFqbomOwlEsg4WWlIHZ1TDXtz3JAhIZvsXhxq9RT3AmAkvcDCow2lhSzr lUZvfeFl+qL9XWYYzdoMDe/PlS2dP3cYjZo5kUCoj96N2wlnbPa0E9Wy5aA/psfyN+9jyQ 5RxFtTgP4M9ELieFBm5Xn31tNKRRisYO0gXn0Uky5l5loQHwtFpH45NHIH3tx2kptWtpND 22IR4pMZ9nzUj9fnDBNEQoQMcXgMa5iLyT8eBUvOYSDbhASuSDiiOlL9bGsw902fNonhfK MlXohvbuQVpZDCVPJ7l+MYfFi4VTrBuorvWOOusJ/ED9HtAfkLLO/zcui34tvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436041; a=rsa-sha256; cv=none; b=i3zs0saH3k7xTypMOl6706xNEpzq9wOCENwcXwOpDMFTQnqgRg07CBC17iaQP64e16EDy2 0cZrcZx0rQihbEJ1y2Yvfb60NQViOwFQJ0/4lKfDaKwtXFeTgwIvvkt4ND4maJAYdKa6hG ZuDOU/2JmLn+hNYXGJDE1peJSo63q749QoLCm1kaStdMbZI5VZrpHIGdqDJyl5kt2UYoOI IpBiRZpR+kvrIBXG8x4IAgdvQQxj0bvqVvU5hAUIxibCJPiyEh1Ft6iM9csj4TaYvO3uJl W23KGRI+5MjcJYA4X+mp/JE47DzQKSZA2UyAguJajDIluDv3KglUsdf4pdS2Ew== 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=1774436041; 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=NvqiNNr5PVFrLwyD7MainJ/hR2ejPDS74qRL7m7b8xU=; b=Y2mIeYbZ9r2zolY1URXrfeFTOPtpCai+Cq+sKoAQMA/XHZYgqmpaCGV2jVYwcCjTY4uxBY WJelNBg2H1ZIyFHnOnuqf5WAU0rVtj6ZK+hYoBrFO8CDWqyKFBfk3+ZbHLadnxeTMqdYnu Fj9ClYKo9c+wMeWDOR1VsqMQBiWGW/YuIKBWCZK0wkjjmjIzFA9Nggz9Ej5R4qg7BL7xWl WaFhPGgO+YVN2BE1p9CoygYmp0orj8ewea28A53AF6zRnxEm7KJaZxJ3UbO5d3sbivfpMS VHsBM7lnt7tDknai/SNhe3dWN2OQ32zmzo/Fq+3JTD1uHzVvT6XD/taYAwDgOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkL06BwLz12GL for ; Wed, 25 Mar 2026 10:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3632b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:54:00 +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: ac6bb58a715e - stable/14 - pf: Fix hashing of IP address ranges List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: ac6bb58a715eaf0afb7a80dc87083f9819e10ac1 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:54:00 +0000 Message-Id: <69c3bec8.3632b.2de2b126@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6bb58a715eaf0afb7a80dc87083f9819e10ac1 commit ac6bb58a715eaf0afb7a80dc87083f9819e10ac1 Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Kristof Provost CommitDate: 2026-03-25 09:58:27 +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 663612305f1f..1fff0667aa1a 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);