From nobody Tue Jan 20 17:15:59 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 4dwYrH4cw0z6Nqgr for ; Tue, 20 Jan 2026 17:15:59 +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 4dwYrH3w3jz3Y5k for ; Tue, 20 Jan 2026 17:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929359; 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=0asRxFoSCt5F6Q25WEtwsdwgOJgi/vn62bmC1opqp9s=; b=a4E/o2JGSJwDHO4WS1qHudtIJ/WlvFwEGs891pE3AAInUKJuT9V1dPI3lQ/dmKLO8LMOUn 7b6qWFJTcnRquSXvNwyrv54qAVDLWFZzAphoUXXbiYxyFALzvUCc3W0PixZVw84Es4cEAy UhTb+aYWbo+NSUprGGwsgIv+/3fY+7Oyne5pIruvGxpPY3+2cKMGF3w5/oc9/0sndjao/n NitzmizOFhnWUHuBallVVfnTKJPvf10pxXJifcRtXu/nI/nvXFZlICDpe76ZpzqidKgCyM TTJOdUxtKP9ihvJO0l+FHBEpqnhzwuMibIhdNUinZWOtayx4t1uq4qH1ZVxUHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929359; 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=0asRxFoSCt5F6Q25WEtwsdwgOJgi/vn62bmC1opqp9s=; b=ZqZRSFdeuioq6CQ6HssXAYqIgWWVVKsRpmj2DdMD/vZBDW3eak14yE98+pYZcoVBjqJ9B3 7eMTffReYzcQ+ZkuIPxKDwOPfh8cG4cLd0UWqO9HGbKUNrWN29PF9yqzlG176YZwzXFD3t KCsJH167Ix1wrU7jO9PgAEtOECqhqUnCIsKG2A4loDFXbaFYi6BfKvZk/ecRso0K905Ken BAvOGyVOd2cqMJhhtPrh0F8FStg5LCVG2np18HBEq9F3rbEfWIrUof8VCo+aSYdPKKt28X IdNcmW2eOOXhvjd+7sRAZavxlylc4d1JS3mXwUkpGeUc1MK09IKGV0SLJYuuzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929359; a=rsa-sha256; cv=none; b=sMOZziduDBOx0zmawB2t+Dt9NuD9Fn88/IwYIl+gxZxYVtE8WcqdJqZxhIByS95ex0HUvF xWxtriHeKQqJh4tfQvuSoE3b2Af+k5PZgAkyAVth0I2H0Is+VjIYEJ4vIKKD5WYDOx7gsB ngQmT/lrioSomKHgW8lp3ygSU0OhNwpNF7NHI98uII2y3eiteMsKIk+/pLfGORhqAOuBeO fgDz0Ayj4b9ejqZvPFweXwCnzWzF6o2cDj+r7VaA/JA3Ssgg4OssQYhs2IA4Y6lFh3p1qJ BxZVc6r7So8VLyWZ5EqSQX3av8plR5Y1HVdfQ5IZiWBDHzxto1Mn8FwtFTXFEw== 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 4dwYrH39wDz1Q9F for ; Tue, 20 Jan 2026 17:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35548 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:15:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b3647e2a408e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b3647e2a408e8a0246ec2240a152f8c41c3482cb Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:15:59 +0000 Message-Id: <696fb84f.35548.38a91efb@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b3647e2a408e8a0246ec2240a152f8c41c3482cb commit b3647e2a408e8a0246ec2240a152f8c41c3482cb Author: Alan Somers AuthorDate: 2026-01-06 22:19:57 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:15:13 +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 c4e3bd683a17..7057e4628cf9 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -401,11 +401,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]; @@ -530,9 +529,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' */