From nobody Sat Jul 12 13:38:51 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 4bfV6M74lJz61srG; Sat, 12 Jul 2025 13:38:51 +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 4bfV6M2v9Nz3CfB; Sat, 12 Jul 2025 13:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327531; 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=ei1Tka1kcedDyDgqoE0XSBbD3Z9ETKucbJfS+vVfxKg=; b=UIPP4VJiAWDJdgWI8lE8E2EB1U3+o93s3bzYcFPlwppcjdGIWShrTmfoHLbs2LZyep17YB j2q2UYbZVjs2zEDU3ES06jMEN7ezaR4MpUT2XO2KE9Cm/+ipNTypwKddlkN/KRfc3jVgJS ZPWqjLnJ53feb1NjBcB9oFjVihhywW2R5cdD7xSHXpsIGk6GvAwaxKm4J/gCPeXc1f6zR5 Pu83jGyP2PVbEqZnqBWRqRhrFHqirjVADZjTIq07FJgqwaJ+TwE+SeMO3kwuHqqmYR95fs A9I3gfI7nS9A3WfveLVWmUgUtFqOeF65CmaS+vLyUA1EtGtK7TJt+4M2Yibqzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327531; 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=ei1Tka1kcedDyDgqoE0XSBbD3Z9ETKucbJfS+vVfxKg=; b=LFKK56V5EO+6b//oXNB+2HN5BYsbdBYKvysFNB45adEyTAAGTXq/Ot86fCL4hXVbFYemGW DHOEjOzUeZ3DngkbzrrNyRhyUIQd8l4lNGzZ4LfxRM4BIdVraKQTiOGb+vinRk5IL6nO6+ qoHSxSs3wnkEOr/8yC8EerKDXEFQx3qD/tEgxFQ2JfxmtkcLLaOEDH7VRWIV1qTOOV4tiG Spbij1Yw/vVa8j9e3lgOVqESw/tWGA6uVyKPiSox0IcLdJSge0j92c+/stD7yC4lxnxG2/ RALdIrRwcI6FWrLNkjeE6Krc41Pav8jt0FPAlntzs+jW52xyJEG2j+13hAvPng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327531; a=rsa-sha256; cv=none; b=B3lsHA0fu/bXf9IPCm9Rxy5C7UnW3HMLJP8PNufJV3/icFSyPLNDqCpqdZ+iRhE67KldFi nQ5aqgyW0dw3fpSRwt3H4/5Hxqy3ds9/qMbyqxTau+HWuaaDpa7G9ko+lLXXX6z7S6frtg V0gY4Ga5rAjzSilqb0+t0DcOcHbuwnlN4Xi1lVLpXdWzfZQrgSUUh6hGPgfdtDWcFNd7nw qM/7p8y9t97cP8WeXRoiZdTtlC2dyYAPZ3FZgj6kH7VYqxuTesonmSgDNcoLZ/D6jscPT3 IK5DE7sSiVQQ00xc2eDkCTcrOWk61UmlTIxb6dJWHPAY4xA8rpXuvuiX5ODy0Q== 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 4bfV6M2HXQz8py; Sat, 12 Jul 2025 13:38:51 +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 56CDcpb1088924; Sat, 12 Jul 2025 13:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDcp2C088921; Sat, 12 Jul 2025 13:38:51 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:51 GMT Message-Id: <202507121338.56CDcp2C088921@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: c87390026a4e - main - pfctl: Fail on missing 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: c87390026a4e11355351d7a22ce456d1ea3cfe06 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c87390026a4e11355351d7a22ce456d1ea3cfe06 commit c87390026a4e11355351d7a22ce456d1ea3cfe06 Author: Kristof Provost AuthorDate: 2025-07-07 07:09:32 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 09:57:50 +0000 pfctl: Fail on missing anchor There is no reason to continue on anchor specific paths if the given anchor does not exist. OK sashan Obtained from: OpenBSD, kn , ad846651a1 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 10f3ee1f44e9..dca9bba06a3e 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1340,13 +1340,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, u_int32_t mnr, nr; memset(&prs, 0, sizeof(prs)); - if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) { - if (ret == EINVAL) - fprintf(stderr, "Anchor '%s' " - "not found.\n", anchorname); - else - errc(1, ret, "DIOCGETRULESETS"); - } + if ((ret = pfctl_get_rulesets(pfh, npath, &mnr)) != 0) + errx(1, "%s", pf_strerror(ret)); for (nr = 0; nr < mnr; ++nr) { if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0) @@ -2962,13 +2957,8 @@ pfctl_walk_anchors(int dev, int opts, const char *anchor, int ret; memset(&pr, 0, sizeof(pr)); - if ((ret = pfctl_get_rulesets(pfh, anchor, &mnr)) != 0) { - if (ret == EINVAL) - fprintf(stderr, "Anchor '%s' not found.\n", anchor); - else - errc(1, ret, "DIOCGETRULESETS"); - return (-1); - } + if ((ret = pfctl_get_rulesets(pfh, anchor, &mnr)) != 0) + errx(1, "%s", pf_strerror(ret)); for (nr = 0; nr < mnr; ++nr) { char sub[MAXPATHLEN];