From nobody Tue May 05 21:26:20 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 4g9BQj0yJBz6cgZk for ; Tue, 05 May 2026 21:26:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9BQh6JMfz3x7T for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016380; 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=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=Hu7lU3wkzPaJMEbPstvgygFhKDaWGNNOszURVtTScEXcE2prAl+yD5elce8Xy03iUDn3y8 1MWC1bLGOOnp/PU2IYaMv1YNqf8B9VTBQbkbVhiUnx+IZEvoiMA7Iq0NxzR8dEeFnItBjn MSj/K70Y+s8ZKd6s3cohLF42ul58FsoRhyIGDSRoGVQMzwQNwOax5ELk6inMsD/o3lw+hb eT2c/uj1SywO94F9REzqtUiv+2HuQ9C2M0xX3Ng6tYmC2wWrrZTR2tOSABS8o1C+rbObzS Oj8zWuZU6s+vGHpGf9fS8IDqbqYb2IvqYxVlKgInTdOjMjjPY/AYx7U4R+oX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778016380; a=rsa-sha256; cv=none; b=KHAeDDRQFYuE7ZootQYCyz89KyGH/GneZLMbARznzKv04OQIF8c4XXKpfIZLw3D8VkI/ve eGcZBIt3/4RfQ4O/xDzrYH12gQYoEsgQAmjxvGeCdnNT/oDfyS2fraKRZrG+Y3evml3oQU mLnSigqHPrV8Ngv+H05Ghio+yDc/DMAlC/So61nKJtqBPWW00T5oup5rvs9tfUm62kjl9T m7pCpBIDbGxkwoxPXuTmEF5/nkI0FRn49EWacrvx80xChDeZZJQkCrwIjDNrNtUrk4Dpm9 fJxuRopZUWT35VZZQ/E+9zO7E56o1bzeH5ocgxdnA3zQxLhuMntRmrNwxbBzHg== 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=1778016380; 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=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=ktepjhxim815zgIsR7FpCN9v+cIZHdj0h9/YPoJxb0IhqR5ZELcMaaCoz3Wl18mzCXifVV IatZP7/qjTP+LkH+2Xh+p1TwgcjU4E2qJ1p9ilzElxeKEXxSCUbxEaSgKQM/Kys0YxnQLY wCPkZpMkTwKGasDwqqqRUSENIfLS05gKGnpfDf/UWGo8Hgi4wK5UUpK6G/VbDOLCv9RqRy kpJYCnpwbKda5EwxmJBIMiPMLovRGsakrgonpAvhzMVweCEG8SGWD+gL4SXUT3vhNlEZdH fhkB2hj4GvGW7HDMQZGLidy5Yk+yazc6bCFt6pp2lixrRcVLELsmqNYabwc9wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQh5vrFz1NYS for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c41b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 21:26:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c24b1d9359b8 - main - pfctl: handle errors from PFNL_CMD_GETSTATES 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 List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c24b1d9359b899c7532d5b296f37cf3d74a36942 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 21:26:20 +0000 Message-Id: <69fa607c.1c41b.4144044a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c24b1d9359b899c7532d5b296f37cf3d74a36942 commit c24b1d9359b899c7532d5b296f37cf3d74a36942 Author: Kristof Provost AuthorDate: 2026-05-05 16:57:25 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 20:20:42 +0000 pfctl: handle errors from PFNL_CMD_GETSTATES Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 2 +- sbin/pfctl/pfctl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 59783592a370..ac60a924c228 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2009,7 +2009,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf return (ret); } - return (0); + return (e.error); } int diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index e84e7f9272d4..f35baf25ec35 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1991,6 +1991,7 @@ pfctl_show_states(int dev, const char *iface, int opts) { struct pfctl_show_state_arg arg; struct pfctl_state_filter filter = {}; + int ret; if (iface != NULL) strlcpy(filter.ifname, iface, IFNAMSIZ); @@ -1999,8 +2000,8 @@ pfctl_show_states(int dev, const char *iface, int opts) arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; - if (pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) - return (-1); + if ((ret = pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) != 0) + errc(1, ret, "pfctl_get_states"); return (0); }