From nobody Thu Mar 26 01:14:57 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 4fh5RP3Skmz6X45S for ; Thu, 26 Mar 2026 01:14:57 +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 4fh5RP0qpmz3JlN for ; Thu, 26 Mar 2026 01:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774487697; 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=FKC9CEqmo4AU5HwEJiJnMmJUbb27rc/7U5NgmNhQdv0=; b=TIgBzqW/5VhWLnkqCdO33BHJJa3UlvGihrUt5zlRJNMBokLEErkwAeg9O+t34l8zpzMzIv kS95cYEeXNvEJ7Olia5fZyOa2/774ZtbJiqRhoVgfT1aTHt5far4St7CSBhs2haDkMDEM8 aN6apKtW6rtGmlG4ymKuureeILvZO04nSFODcsbjw79Z64OfIq7f+Td8ryZCLxjRrp5eq0 FyJdBpLPqgOjwYF1RSjDQw+sfX/urO3KwJ+0oshNUlFvduauHocnPfce3GArjht3s9/jpD VqtWo1jBed3KrclX1gwE7po2Vu4N5AXnt18yk5dLbOtBQcDkaOl5HIOvrbSXaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774487697; a=rsa-sha256; cv=none; b=u4sqf+FSPmv62p+8EJouZ5k8KwWnGJdpXWklsWcvRloQA3go6XRqrt9R8g6etEDn6CeKHp mKLdh7UStConAyNaPSOOucE7Ymr3WgaHiaj3iZ+NPXrzgswheu+6P60xlpYUb/WsL5hGEm haIdK4e4Uf7xOXyEtdOUu1njiNKq5FWszyJAmYxvmLi1zyZ+B8IZQ0Mue+w21LJ0wp64z5 MkKibAn6Lg+nzYy3z6WAXNv0gBRlZ/yrCTKZR3/SJoQK5dznSMRW7AtBH9W9N2DOKPeotH y6JNYaCYEteesp4kwGZX+YuZc2LCy7vZz9Fl80N/FP3vmBG/4UvL3Kd+THa04w== 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=1774487697; 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=FKC9CEqmo4AU5HwEJiJnMmJUbb27rc/7U5NgmNhQdv0=; b=nNgsDbCBbSP2f8d4zYVLFx4DPU+PkyaFbWoHVbVUDhTN9lYSK13/E9+1JI9BeOsXii8NeH olrAmD/R5r6F3xcuR2aDJ6soDv8IE0DOHwfxDWqIUvUzXBS9qqILLv15Na9QOQpwndjKXo V+2DwIoVevNLkPaZ2PCOk2nSeoAwEveDlnmPnBPqRMn9RKbKNtqsdSfdj5Hut0BocCXE2d qoYTz94Ap02zVKqf7d7MpjfnBeGMI9hHNny2SsY5RYm6vbRIZ/RPnCYhnuahL/FbL2Jhci DcYlIdGMdcsD6QCvVg8HS9Tj3pXpOXbxEK7geEuBWqxDhazamuwslkaFInWDjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fh5RP08tdzTvT for ; Thu, 26 Mar 2026 01:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 01:14:57 +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: 4708ee4543c6 - releng/14.4 - 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.4 X-Git-Reftype: branch X-Git-Commit: 4708ee4543c6e5fedcfe77d273a5d5de1b58779d Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 01:14:57 +0000 Message-Id: <69c48891.18f94.2433ec52@gitrepo.freebsd.org> The branch releng/14.4 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=4708ee4543c6e5fedcfe77d273a5d5de1b58779d commit 4708ee4543c6e5fedcfe77d273a5d5de1b58779d Author: Michael Gmelin AuthorDate: 2026-03-12 14:18:09 +0000 Commit: Philip Paeps CommitDate: 2026-03-25 16:10:16 +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 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);