From nobody Wed Mar 25 10:53:59 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 4fgkKz5sLRz6W4x0 for ; Wed, 25 Mar 2026 10:53:59 +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 4fgkKz51yTz3MMG for ; Wed, 25 Mar 2026 10:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774436039; 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=Q6nT+tpgvmPJcalU6PkLisO2Udt+RlLooPbNlJPG34w=; b=vw9maGb9xyuEha4dA47q1O/EbsLEjnoSyLoJZ3cnfWbQ1vGr8ttx4tJVLfRzO46QxxAuUl Cs0g+gkLaK3O/IdAxVSwBar2EcxrQenasJ7HZccX5s0swWt35CCeVb0DMrczPDbIMBb+IO tkEI3CS7nSy4gXhoFEsyA/FHKhgJVaOrduNpyWz3yldNCpxwlr1khGxjYqlyhkWBtJDRoO tVJNpkEtWeaXaZFYaMg96NOegkL6CmGWcQwV0GyZNLz2APyJ8djmQM1vogldXxAJvF36X4 HuhjOLGgQIWApuKBX39v4PdJroVl3ffpw27vBCWyDl+/n9y80RBm8mg18ZW1Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774436039; a=rsa-sha256; cv=none; b=lLYXYumpHZPzIB1zrD1BsQPEQKaE+h/Zljo4QcoKBnDWOySu1Rl8Leixj/7/jczRUTuUxR zzG2MtpqKUf9dfPdPnOj9zeTaKJZheu/Yscds9KHoEHB0yxaRg+9O6HRlEjE89GAyGF3R9 BisWy1d7yCgu9vIuw9sa2Y5Yz2rDp7+I4lmydAK34IhC9LL0qs78f5tmkn8MNIc2fNyf1S hlmZQWvnqvcb7X7UadwLu5gEfZ5rh2Rf1VuIPmKQPCV5zycsFvAGjgqKoMyuVXFXUbtiXb d/Fa5l/xvnJQOv53idtR3lf+8fnHJQ2rCYUeV+X/sdSLs/kSsZxqzB2YwLA3VQ== 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=1774436039; 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=Q6nT+tpgvmPJcalU6PkLisO2Udt+RlLooPbNlJPG34w=; b=olWVs9Vcp/BIPW/3VG8iA+q85KrwkjTxVyRMPIIQzffJ236fd28rpcKBCwYqnCR7jL0T3B TmHgHFONCMYlXNcn1xNVWIXAxCVKWtH7GlI3DhZR0HaDAMqduGphSTkIY9Z/rqt9jGaiZF Q4EhTgsdCV1ro7JDhu32GNFsoJERc4gZDHtIiLcpe4bMDYaE1BsT4bhCIXpsMryrJzcuNb cmvGzg5kGOdsuyAGp0KvpzV5ovntN+OI955eLUZCNftGmlTs2CkwiEPdoFHmQ/ldvjjLo5 uEpLoCiBzEInltEF8GG5W9MRfkHWIj+OPxkTfx6F28Kl6ERT2gSvPY3G9Vym0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgkKz4XHZz12kJ for ; Wed, 25 Mar 2026 10:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 10:53:59 +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: d107424a44b3 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: d107424a44b3fd08078218b22f55feefde3f285f Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 10:53:59 +0000 Message-Id: <69c3bec7.36d8c.6b1e818d@gitrepo.freebsd.org> The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d107424a44b3fd08078218b22f55feefde3f285f commit d107424a44b3fd08078218b22f55feefde3f285f Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Kristof Provost CommitDate: 2026-03-24 06:13:54 +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 cdb0059a5e0e..1672d212b660 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1045,6 +1045,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);