From nobody Sat Jul 12 13:38:55 2025 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 4bfV6S59H9z61stb; Sat, 12 Jul 2025 13:38:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfV6R6Ks8z3Cfg; Sat, 12 Jul 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVC905ryfPPIf6pwb6iejwfneNZj8uygIr1++BjvwVM=; b=A+2wvM+Kgtbwwi66bgUfkJWWG+mK+gMMPsZhHGWBFDfwBigbcKDMUscayEWXzRDrQQC6+N hLWr+xp0wE3cB9KUu/l8Fqpd4JSBvIIdT0nMYLP8dJFmIwChiriUd6k8I6gJKbhlrLE8e7 /FFUPynv0/xLeose5zMx8MwuZWBZSacFfIGwXfg5FLhUrRsEhWHYq1qVQlFuMyqPqCEdn+ 3g0l1IoEEs2uR+3kg+TR1XCCPa9OuW17a3GM+OOpnlsZoPTg2jHc2kchHh05QgLU0Vs+Ck EVIaI+d7qyEUGM/cJQTxXbN42gqLx3K1tg9e9BES9qniZI8F2DNhn9I/IRrjrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WVC905ryfPPIf6pwb6iejwfneNZj8uygIr1++BjvwVM=; b=NURzLTWAce988AuYOzghKTQLesac0AIrHjoUZuhXgUIG/Ucz346xo2+PKpGTdW1ZN7p2Kr eq8scXJgl9K/p7orydsfr97fh5ixnwBUKAIQ/mJ6NaIpxGzMxVjXGk8w82gkHdziDA0+b0 Aish3cq+N+TVxCY77ivA8ZieGrVC/oMtBE46adq2iFaKhd5RmBLrPNzQUKeM35WBdLjVDR BkSNhoKO3y49JOehen9m/OTCD+f4yTtpJGI4MAsArnYskJntYoxPdFZynLVZxdmOecef5Z ilhoB/qqSdKH7+pnrZKldJWaALNd3fYjdpryI4vXZC4RqaJ1cJg8GiSJJBMHGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327535; a=rsa-sha256; cv=none; b=smBKv/D/MXhCwK2Tuk/VaC15i6JU0kqbp4FjTDL86st722W7rviXiMlL4YaSwXD9J+aBtS alCbMH1k5WwCzDsY1A2pu4ClUlVDg88ZJNM9GBgWZ+eAyM2WEQ8SFhCPNClcCecMZ8FJWh G/y/xyAPBZnRIyjJZuvdQJqC1tVLkM6Ba5X18UCdQ9QLsclsWDBwtgnynSua2gQY3PUBcm +gE8RzfvMrF/UY/cAAWOaA/BeMY/LoQVtAUp536n7z/ZymMmXCXjx63i+XDLqIQJUTUmD0 MYNII/rfmZ95Yj5GGky6r91yRUrr8kuRhHa2tiPTzKVde1rk8XnrBcYch9l+ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfV6R5XS8z8q0; Sat, 12 Jul 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56CDctdu089075; Sat, 12 Jul 2025 13:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDctLv089070; Sat, 12 Jul 2025 13:38:55 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:55 GMT Message-Id: <202507121338.56CDctLv089070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8bced6260072 - main - pf: Fix pfr_kentry_byaddr() to be used for a rule in an anchor 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: 8bced626007201293dbbbc217d4a6dd7e8ecc9fc Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bced626007201293dbbbc217d4a6dd7e8ecc9fc commit 8bced626007201293dbbbc217d4a6dd7e8ecc9fc Author: Kristof Provost AuthorDate: 2025-07-07 09:26:06 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 09:57:51 +0000 pf: Fix pfr_kentry_byaddr() to be used for a rule in an anchor It couldn't find an entry if its table is attached a table on the root. This fixes the problem "route-to least-states" doesn't work. The problem is found by IIJ. OK sashan Obtained from: OpenBSD, yasuoka , a7d8badaea Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_table.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 43e4366845a2..4faf328a2315 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -2074,11 +2074,11 @@ pfr_lookup_table(struct pfr_table *tbl) (struct pfr_ktable *)tbl)); } -int -pfr_match_addr(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af) +static struct pfr_kentry * +pfr_kentry_byaddr(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af, + int exact) { struct pfr_kentry *ke = NULL; - int match; PF_RULES_RASSERT(); @@ -2121,11 +2121,26 @@ pfr_match_addr(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af) default: unhandled_af(af); } + if (exact && ke && KENTRY_NETWORK(ke)) + ke = NULL; + + return (ke); +} + +int +pfr_match_addr(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af) +{ + struct pfr_kentry *ke = NULL; + int match; + + ke = pfr_kentry_byaddr(kt, a, af, 0); + match = (ke && !ke->pfrke_not); if (match) pfr_kstate_counter_add(&kt->pfrkt_match, 1); else pfr_kstate_counter_add(&kt->pfrkt_nomatch, 1); + return (match); }