From nobody Tue Jun 16 20:20:02 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 4gfyyp60FZz6hlYw for ; Tue, 16 Jun 2026 20:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfyyp5JHNz3f41 for ; Tue, 16 Jun 2026 20:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781641202; 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=65tWpgVETG/gveweFPe/7w46UNv+pLS4OpGcNBK+JjA=; b=ukr1q7aiil1Ekq00On0FIeh9IVFQIGrjgDz6Hsg1B1+v0wZpDoD5Tzp7CUcdhRYoam5Otq aWWskyprLWvFrXLA75gfJ1nK0W4aWXSr9CX7n8Zra4x9+QIxImUE/OhxDL9MxNlp8mrAaN gHLfXxoCo2hcX/W2bdvt2jEQRjANNYP2qlfvfMvvzjd+mbWgPiRj5y4XfHkkKK21MeADM3 +WeJdrVhUDWUDz+dzyzfmISi23S8UxygL4Isv4eq73zjqiTj5mqTR8ooG0+XfHuMEXm1Y+ BRns5iQ7nYQauaUi2pa0vmrrJXVVe0FNGUh07HzpGSemxRODrXo+7HQ9tfGPPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781641202; a=rsa-sha256; cv=none; b=PmkU2hyeZabWJ/95EDyx/u8ZALWvgN7rZ9uT/ZQWUDzuXx6YCRHWZ4Sl+uf5TrUtGS6RGe kJ1OVrxGF4va/Xc5TpSc8U/G5acUMFsdWFL21yBaAETod7feOEAYlEXh+SwBlm6rgfSXST N5dBlODGs/ZWJ+iz3OJql0BOoDvSXRpVPNHXVUK9YDS2uaUtuNFg0TjwA9EXqj8TkBRhxw 4gL6gqGv2NZMpSRlXHcAoVmHiiOSoESJwxrB/GCchbgkpGN/QUe/t6jP8Rg/hXCsVtIToC 9CfvqxR5yCQp9j/QiQS4uooE6BJ+fl4Owzbq1SJCHzVbztvn0WHgcW1TlNAn5g== 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=1781641202; 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=65tWpgVETG/gveweFPe/7w46UNv+pLS4OpGcNBK+JjA=; b=BgIZ/6VBRgbpx+pUwaj+IOkz1IacLrllxUmRQhk6wTbHC39KTB3otV2u6LQux5WIu2cEv8 g5ksa4wfnJblL2ZbuzHaj4WDpNEfTZvoqeIoQvYwN53Uan2qnTo/F7IwnqC3OasxKbQYlT zm6WmdFqF32sqcxM+8SJHqd72y0mVfelbOlG3+5ZahRYIsAhTVMm+Yop/xem3G6j4vPL+W qzCZWrDLo72Vw28Km5E9Kyt3kRM8cMQc/Lfi2ZcNBw0HnczeitBTDB83sNEO7oaV8iz4+P gQ4euZ/rTBD6dw0wuDYc+rbjpvtQu7tJVcfikqradNoyIO93C0fU1ogLydqLzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfyyp4k7fzh5t for ; Tue, 16 Jun 2026 20:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38020 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 20:20:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 34e155336f0d - main - pfctl: pfctl_get_astats() doesn't set errno 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 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34e155336f0dd10efa8261b971fd540d92817339 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 20:20:02 +0000 Message-Id: <6a31aff2.38020.7bdfa38a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=34e155336f0dd10efa8261b971fd540d92817339 commit 34e155336f0dd10efa8261b971fd540d92817339 Author: Mark Johnston AuthorDate: 2026-06-16 19:37:35 +0000 Commit: Mark Johnston CommitDate: 2026-06-16 20:19:44 +0000 pfctl: pfctl_get_astats() doesn't set errno After commit 08f54dfca197 pfctl_get_astats() doesn't set errno anymore, except in one place. Fix up that one place and adjust callers appropriately. Reviewed by: kp Fixes: 08f54dfca197 ("pf: convert DIOCRGETASTATS to netlink") Differential Revision: https://reviews.freebsd.org/D57608 --- lib/libpfctl/libpfctl.c | 6 ++---- sbin/pfctl/pfctl_radix.c | 9 ++++++++- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 839693269102..50d85a7869c9 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3877,10 +3877,8 @@ pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, uint32_t seq_id; if (tbl == NULL || size == NULL || *size < 0 || - (*size && as == NULL)) { - errno = EINVAL; - return (-1); - } + (*size && as == NULL)) + return (EINVAL); snl_init_writer(&h->ss, &nw); hdr = snl_create_genl_msg_request(&nw, h->family_id, diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 608c22141ae8..db6153941cca 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -194,7 +194,14 @@ int pfr_get_astats(struct pfr_table *tbl, struct pfr_astats *addr, int *size, int flags) { - return (pfctl_get_astats(pfh, tbl, addr, size, flags)); + int ret; + + ret = pfctl_get_astats(pfh, tbl, addr, size, flags); + if (ret) { + errno = ret; + return (-1); + } + return (0); } int diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index f01218bee5f8..8221bbac812f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1355,7 +1355,7 @@ pfa_table_addrs(u_int sidx, struct pfr_table *pt) struct pfr_table tbl = { 0 }; struct pfr_astats *t = NULL; struct pfa_entry *e; - int i, numaddrs = 1, outnum; + int error, i, numaddrs = 1, outnum; if (pt == NULL) return (-1); @@ -1373,9 +1373,9 @@ pfa_table_addrs(u_int sidx, struct pfr_table *pt) } outnum = numaddrs; - if (pfctl_get_astats(pfh, &tbl, t, &outnum, 0) != 0) { + if ((error = pfctl_get_astats(pfh, &tbl, t, &outnum, 0)) != 0) { syslog(LOG_ERR, "pfa_table_addrs(): ioctl() on %s: %s", - pt->pfrt_name, strerror(errno)); + pt->pfrt_name, strerror(error)); numaddrs = -1; break; }