From nobody Mon Oct 19 20:25:15 2026 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 4j7n9761Csz6wKTw for ; Mon, 19 Oct 2026 20:25:15 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j7n9747dlz3QGb for ; Mon, 19 Oct 2026 20:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792441515; 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=WQ+gR8eS50k7rChl7Oxly1qfVl9CJ/4q1TxeZh/6xps=; b=FIAXkUXIa3jb5Xa80VRUMdD8cw4uY9+/qFn4VdIQL81e+h4AXQldY7vu5CJERAWs6zmLdf SoOfius2Y3vsHPq/RUabzpySEbRrzNleR8irNxaWbJpDggL0rFfWkKROR72SqX9QsJovhU BHgo6sJ+GqBqFXh9XtsdWtT1kh7fQsg9U7jq2vJXpVLnA73A6HfAM6UHyT+dOgddbhHePD tMre7ciDrh9r2WuNp7XYRK8qr/v6eVp3acT0xXe51+mXzNbokCN+K9lOhuTBUTarVcwcFa jCz6Yk85K+FChhXj34/OH5/b5TG3zFlD3DtB/bkb9GwdJMLsh7rd1Fdow0SMcQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792441515; b=g/xB8BmPsuL4yZBRsWKhBGStmUoUcvp9RL9P0gDPpL+hDu9hwCVRrqTcVB7plxkVfMVK2p QoXM/AUKH6RsmLu6RoP9kht/XpOoD/fROnHW+uJXEdNWLf678A73b7Be7kXkgXVGuPpEw4 SXiH3T/rqNrkV0ZVGelcauYTl0hMFRh0V7Yw4daNgSHymB6hFqJcGg9nN1smIe343zJ/6F +EzvuOnihHQbhVta0glrijOU3Z6kEi+N8PQ+4G/TVqQIO8xOYo0gqCOlUsytOsR7Obtt3k BcQa1id09efhlR4wWw8MBt49sSdj3K/xa2+01hEQDLWkFHHvOMREMEzfbiXUdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792441515; 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=WQ+gR8eS50k7rChl7Oxly1qfVl9CJ/4q1TxeZh/6xps=; b=jWoyiH6ttgIqUaMcYgv/E981rrxjLIAZOf4tAYqrQ+X66Q3RqSI3TKwzP4aTeKmZvGjN4M BY0RhzXtkNYE9Yn7Tb0vfzgTRi4o0xyThFOeh78oIdSRGoJ/EwLK+ydWZJM8500h3P87rN eauRG01/G+Hv7y78OdUNeDNRt0OrVtRZGAwoa5T4SjK98XQL6VNhh8/H6ZPMgm3n+9ZzVE DnS0Fwv1QJuZQRajJVEGiPmEkkauCMWbxz8HLMfnuLP1pNlzKxGhGdR8IOF3k7hjbA0+UN /9mo8I4JpNSXYtbR0UalKKVNbMSavK9aaxKLMmMCV0VHr8XfcrvcRoiXUJexSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j7n973pKXzcbG for ; Mon, 19 Oct 2026 20:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 20:25:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 96944ab79acd - main - pfctl: Report why a table definition failed List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96944ab79acd48d8a552e6b1229fc46361e65341 Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 20:25:15 +0000 Message-Id: <6ad67cab.3df43.62ba3d34@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=96944ab79acd48d8a552e6b1229fc46361e65341 commit 96944ab79acd48d8a552e6b1229fc46361e65341 Author: R. Christian McDonald AuthorDate: 2026-10-19 18:47:05 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-19 20:24:36 +0000 pfctl: Report why a table definition failed pfctl_ina_define() returns an error number instead of setting errno, but both of its callers print errno. A table that failed to load was reported as "cannot define table t: No error: 0", or with a stale errno, both in the main ruleset (process_tabledef()) and in anchors (pfctl_load_tables()). Reviewed by: kp Fixes: 219ce3063840 ("pf: convert DIOCRINADEFINE to netlink") Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 7 ++++--- sbin/pfctl/pfctl.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 1505e566f3ba..945955059d91 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -5937,6 +5937,7 @@ process_tabledef(char *name, struct table_opts *opts, int popts) struct pfr_uktable *ukt; unsigned long maxcount; size_t s = sizeof(maxcount); + int error; bzero(&ab, sizeof(ab)); ab.pfrb_type = PFRB_ADDRS; @@ -5982,8 +5983,8 @@ process_tabledef(char *name, struct table_opts *opts, int popts) } else ukt = NULL; if (!(pf->opts & PF_OPT_NOACTION) && - pfctl_define_table(name, opts->flags, opts->init_addr, - pf->anchor->path, &ab, pf->anchor->ruleset.tticket, ukt)) { + (error = pfctl_define_table(name, opts->flags, opts->init_addr, + pf->anchor->path, &ab, pf->anchor->ruleset.tticket, ukt)) != 0) { if (sysctlbyname("net.pf.request_maxcount", &maxcount, &s, NULL, 0) == -1) @@ -5995,7 +5996,7 @@ process_tabledef(char *name, struct table_opts *opts, int popts) name); else yyerror("cannot define table %s: %s", name, - pf_strerror(errno)); + pf_strerror(error)); goto _error; } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 75ee6c700bbd..9ffdea03fea3 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2476,7 +2476,7 @@ pfctl_load_tables(struct pfctl *pf, char *path, struct pfctl_anchor *a, pf->anchor->ruleset.tticket, ukt->pfrukt_init_addr ? PFR_FLAG_ADDRSTOO : 0); if (e != 0) - err(1, "%s pfctl_ina_define() %s@%s", __func__, + errc(1, e, "%s pfctl_ina_define() %s@%s", __func__, kt->pfrkt_name, kt->pfrkt_anchor); RB_REMOVE(pfr_ktablehead, &pfr_ktables, kt); pfr_buf_clear(&ukt->pfrukt_addrs);