From nobody Tue Jan 20 22:31:45 2026 X-Original-To: dev-commits-src-branches@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 4dwhrd51XVz6PFJb for ; Tue, 20 Jan 2026 22:31:45 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwhrd35x4z4CdQ for ; Tue, 20 Jan 2026 22:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948305; 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=BKfuRX7/ws0hrypyZOdJ61gTzgHyGauMuvl6E8mexio=; b=XORJ8CLRwaZWyZI2HZbXmYk4JH898akT15Q2VDZjlt8phZUgIKOWdTh4Az+axac88gtCzG jD2u8SZrxSVzzw4BdamSHnOijsLABqnEp8ZgkFAPMsfaJYoBsf6sZF4Z86ZjM9sOdRpSCU 2Wu3A6nMwtyepz3hoU5M8Lhgv9fGYFPjgUVVp+Cd+95Wql7wWbR7E4BP4JtkdyT6GxuGNu u9f2u7mjNHsNYyEXkyi7EfnxxeL+ahWBzM6RUseM2QeCmMYNmAwSbyzlOYrkmuoQq782j6 o+4w98EEavsXoJgsDWPk+v5cxOEu1xPok7YS1pkz99fGywBGSLfk2XhBuxEsvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948305; 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=BKfuRX7/ws0hrypyZOdJ61gTzgHyGauMuvl6E8mexio=; b=GUri6VkzkEJEjIqIOeV7gC3uL6gzZ/OwcMlkk+DEBNmDXRDGQ5NQO6jc77wJYAs+aq2LnU vYXz9Ybf9ea8bufpmh158eIyyfkF1weCEShmx1l7vQeOuevnWxZWTMybf84kqRavttInVJ dNWxXHJ6gOuZQhpebaVjLRpBLrj/yNsM1BPvxYpdJhz4PvAPHnR3nJDN2qNx1ypJY44c4t SPWRijySSO/Awt5RAFZp6P5FhAaMXF0k/lYa669FmM0+JYTeTVjtWyTZo+7jquPDNvYxF6 S7w/JLJcGq92zHIQym5Bwd1VVUfURR22vUgYC2bTuByh8zMEdLtWMLAIIYkf6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768948305; a=rsa-sha256; cv=none; b=h96+SoIIKx0rnxFmILVTDdJwXiVi6HFQn1OGM+yxZ4b0ySp1o0cwSV1UMZHGeEzjnSzSC+ dYAnQZ8WQkqFQVpPP0XPKHur66qvv6eAICbURoK8eQe+jqXIKmFowi9AcWKmNafYL4UFKO 9ReZMdf4+3qFoXtkA/6eFh//X0uDJHBQHlLHd4yeaFiRhXwFtRgoRqPdUZsnYpw3islfEy 3kNEgdA47H5ydF6maLUmEVILmUXWNStFErBJo8pauDMp+ZeiyREV0Dbajk0O7/NV68Gr6L 2b+9vKE9bpeYzDPjWCf1SrIpC11U9Py1lVFIXsei+xsQVOht3hRsAsF2IL77NQ== 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 4dwhrd22rBz5hf for ; Tue, 20 Jan 2026 22:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35058 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 22:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1ad466ca8385 - stable/15 - netstat: fix a segfault with --libxo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ad466ca83852694d7ecee441dc94faf61c27bd4 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 22:31:45 +0000 Message-Id: <69700251.35058.aba5ed1@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad466ca83852694d7ecee441dc94faf61c27bd4 commit 1ad466ca83852694d7ecee441dc94faf61c27bd4 Author: Alan Somers AuthorDate: 2026-01-06 22:19:57 +0000 Commit: Alan Somers CommitDate: 2026-01-20 22:31:30 +0000 netstat: fix a segfault with --libxo Fix a segfault when printing the "protocol" field. The field-format and encoding-format were expecting different numbers of arguments. Also, fix the width of the tcp-state field in encoded output. PR: 292228 Fixes: c2b08c13c20 netstat: add support for UDP-Lite endpoints Sponsored by: ConnectWise Reviewed by: tuexen, js, des Differential Revision: https://reviews.freebsd.org/D54567 (cherry picked from commit 3b6615ec0332f901fcc9e9307f78717424f09c1e) --- usr.bin/netstat/inet.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 1435de95613c..ddc9a2fdd2f4 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -394,11 +394,10 @@ protopr(u_long off, const char *name, int af1, int proto) if (istcp && (tp->t_flags & TF_TOE) != 0) xo_emit("{:protocol/%-3.3s%-6.6s/%s%s} ", "toe", vchar); else { - int len; + int l = max (2, 9 - strlen(name)); - len = max (2, 9 - strlen(name)); - xo_emit("{:protocol/%.7s%-*.*s/%s%s} ", name, len, len, - vchar); + xo_emit("{d:protocol/%.7s%-*.*s} ", name, l, l, vchar); + xo_emit("{e:protocol/%s%s}", name, vchar); } if (Lflag) { char buf1[33]; @@ -523,9 +522,9 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp && !Lflag && !xflag && !Tflag && !Rflag) { if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) - xo_emit("{:tcp-state/%-11d}", tp->t_state); + xo_emit("{:tcp-state/%-11d/%d}", tp->t_state); else { - xo_emit("{:tcp-state/%-11s}", + xo_emit("{:tcp-state/%-11s/%s}", tcpstates[tp->t_state]); #if defined(TF_NEEDSYN) && defined(TF_NEEDFIN) /* Show T/TCP `hidden state' */