From nobody Thu Feb 13 12:39:02 2025 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 4Ytvr66l37z5nRZd; Thu, 13 Feb 2025 12:39:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ytvr61pQkz3fhx; Thu, 13 Feb 2025 12:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739450342; 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=CX2lJK5AApslDCoMZGlzM9WDm0urPdGXt12y264BIDI=; b=XWhfpRsKB5TDtzrG3ZD3i/ZB37QpUDShpsFP5ZCUlmm5Bwiv0V5yAmWQW5xZqRKuD3HfYd Uy8IFSFXrZtQZsnS7iUJo8HDKzQQFmOJDYwf8qkeZoy7qyt2HoMcvKrftO9+LscMRcPHVK K0iql8dEXA2tzIMjrsDQ4+agq3JEQQkfo0C/wMFIoR2t+puRVDMOGijcSWpndYnqYz20KA b/iXeGM6RT6Cj7Pfs2gPyv/WyyK1UAalk4qRKKGUFW4EvJA/fVN0mMYnmGYxv6oR2pqkaH LdnvCYJjNlDNpkfgFxDemRcif0p5g99wEWHKTfbdG1byXQJgom24vC37yQ+vqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739450342; 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=CX2lJK5AApslDCoMZGlzM9WDm0urPdGXt12y264BIDI=; b=agcFzCNJj5Z+VAGlIg7t02bnmnGa0eDPM7Nk1zre+YGyGh77CnUWzBn4csLglm5NqAM7xK MbwN4x1cWQEH3GbnoLhFHiZeD53UKxPsZaa/Xhn/VnpUJ+b8GpTMj80gdwHa2GWGUkyK6u GoSldMM3yPFVdawjaeDNlWIelt6z0P3NksLk8o/uD75spjgnoaBJteUstOwohscru1gJSm Xeays7lmM6ulU+iF9RGjL/+VN/541KTAfMSCjGGVl5ztl7jBVfYG8Ia3639GHG98WGev86 /akcNKwyK0BeXs2SKivCmDEmw5E39iNIAGM3OzgsrK14bNir/Ii1yCchrKwjkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739450342; a=rsa-sha256; cv=none; b=trgkyBToan19wtqm5DH0Q4N/f2/rM/QPo1wxH7osu5UAzRsUfOvsVh0B0Y3y2Q8rLNSNdM WzZt0355fK5kVVWqiAoTxp3t4mhHS5x73xPkJF6q7SCUsOZCh3fSQlXi1s1Adp9MOOR4df zwhejgiSn5zq25b+dsJwdd3whY+ej1qmKCdFVd/XsXrtyK19M2g7Y4XCErjOcnpp0rsc7v Qpp7U/Zpv5K/z/2zmgGif6vbr9Js9oh8aCc3k7sAhMgwO5T5ZIjUaV6UxKCcp7HVNdq8gj SEPYq/A5DiFi0TZSHkYse+4zCb8XuBohyFA2ruW8Jv4P7Ql1NU1X9MElPMp4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ytvr618tlzlNP; Thu, 13 Feb 2025 12:39:02 +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 51DCd2bE075480; Thu, 13 Feb 2025 12:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DCd2re075477; Thu, 13 Feb 2025 12:39:02 GMT (envelope-from git) Date: Thu, 13 Feb 2025 12:39:02 GMT Message-Id: <202502131239.51DCd2re075477@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: 9565df4e7fa9 - main - pf: fix 'quick' for match rules 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/main X-Git-Reftype: branch X-Git-Commit: 9565df4e7fa9348d4200e2607e84f1a4bea54f8d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9565df4e7fa9348d4200e2607e84f1a4bea54f8d commit 9565df4e7fa9348d4200e2607e84f1a4bea54f8d Author: Kristof Provost AuthorDate: 2025-02-10 13:32:27 +0000 Commit: Kristof Provost CommitDate: 2025-02-13 12:38:43 +0000 pf: fix 'quick' for match rules In pf_test_rule, when dealing with a match rule, obey the match rule's quick flag to decide wether to abort ruleset eval instead of the last matching rule's one. Makes "match quick" abort ruleset evaluation with the current block/pass state. From Maxim Khitrov , ok bluhm mikeb Obtained from: OpenBSD, henning , c5611d5b70 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5c99cde4a9f4..76f508b43750 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5825,7 +5825,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, PFLOG_PACKET(r->action, PFRES_MATCH, r, a, ruleset, pd, 1); } - if ((*rm)->quick) + if (r->quick) break; r = TAILQ_NEXT(r, entries); } else