From nobody Sat Aug 29 13:14:18 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 4hXG1R0M20z6qLkV for ; Sat, 29 Aug 2026 13:14:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hXG1Q4J3Lz47hc for ; Sat, 29 Aug 2026 13:14:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788009258; 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=pr3729XauOJpObPBryc/7Qqz7uGnKAG9DyfgKoQcjIQ=; b=AqjK7Tf02Yf6wzh7QUu2a3wNEsvnWPAKD3ohSyquskGWJTjYJPSvgLIz0tv5TcMaaHfHlS nhfjPYB1b2NRDOwCbvEf+GgjgFJBOmPgaA+26+cVDFOjpEw0Qtvs5dghhsrlkRJVHnLIQl ZCg98wfHGKA79Zd4zh6Fsmz6ujag8bqp6cJChbGwulwrLRdItiIHtVqAWsVrVUKEUV5+Pu OHSHsIsm/D8JawkeIB74xF2thpG88i4OYLfMLUavifMBHMWz6/OgomNuSzfxQuSxLkLups FxyH+N/utObQNp2RDxFxWXJ23heZIQnZpoBC1IEycgWVol3E2ZKMhHhMFjVVPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788009258; a=rsa-sha256; cv=none; b=KYkf4MNVNr5RnOnEveBwbaagBakVtdHFvy+uiZIoeQ1N5v0cpa9JjOeN5s8KqszKYcbHz3 uN/NvPEoPcWFVKfN/d2P+S2/YNXmYbXGsSO/RWCxFwib8PvDVgY6VIWQxmNiLfWXJpSiw4 AJxiknR4WzlkV0rS11bgpK09Y+xKbM4qHt9LygWTI2SUHDq8I0rnxUotI8yQAGo0hNwn9q J/Gk6DS4uIDw5rdE4jt7UkpSXVMUaOdTJ8BHA3lc3zlbuCyuAY/ADfu6ZJWalt4os85KxC m2xrqCv9ZB5nDAQ/AoXy6PEEh+RekteJspscph6rM+M3UN0JtRCUL/AUj0xf0w== 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=1788009258; 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=pr3729XauOJpObPBryc/7Qqz7uGnKAG9DyfgKoQcjIQ=; b=O5tF7liQPczwhrM5wwQeG4DUFCSRvw1+5CDg58pX6zVVpSx3ABKWS6LOtrCoRmFA134wKo GTOMFBBGFGvj7S9aXNwDNAsp14EF52f5FFKQPcjGGgo6LQH9RjRJj2QQBap06UGVADZiIs OKG6V/diJz5YeQZYIMSMqW+abi++kQ0LhxMrRZljpoH+ANF/JalNPtP+2ILOQRTsmlZzg3 CTk6SFV9ZxnWNzjYHO9cUF+1lACHQWFJ9dXp2utdaF/q7y4RQaDhpGFifv0VqykbkrYS3c HOexkFW9BCa4X0QLd/l6ALTcSa4qW2np8BBbGuBGtOTxSx9EIT4OhvTqfwmE4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXG1Q2jpqzgx8 for ; Sat, 29 Aug 2026 13:14:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38487 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 29 Aug 2026 13:14:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tai-hwa Liang Subject: git: 46f09c4f099b - main - netstat: filtering out unsupported address families 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: avatar X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46f09c4f099b11a997a58207c78bd5f5752cc853 Auto-Submitted: auto-generated Date: Sat, 29 Aug 2026 13:14:18 +0000 Message-Id: <6a92db2a.38487.7d25aad4@gitrepo.freebsd.org> The branch main has been updated by avatar: URL: https://cgit.FreeBSD.org/src/commit/?id=46f09c4f099b11a997a58207c78bd5f5752cc853 commit 46f09c4f099b11a997a58207c78bd5f5752cc853 Author: Tai-hwa Liang AuthorDate: 2026-08-20 00:22:15 +0000 Commit: Tai-hwa Liang CommitDate: 2026-08-29 13:11:41 +0000 netstat: filtering out unsupported address families getifaddrs(3) may return AF_INET6 addresses even when netstat(1) is built without INET6 support. Avoid passing these addresses to process_ifa_addr(), which does not handle AF_INET6 in that case. This fixes corrupted column width calculations and runaway output from netstat -i, which could cause periodic daily check output to generate multi-gigabyte mail messages and exhaust disk space and memory. MFC after: 2 weeks --- usr.bin/netstat/if.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 637aa4738d40..de2c5aeb8d06 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -383,6 +383,22 @@ max_num_len(int max_len, u_long num) return (MAX(max_len, len)); } +static bool +skip_ifa(const struct ifaddrs *ifa, sa_family_t af) +{ + if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af) + return (true); +#ifndef INET6 + /* + * getifaddrs(3) may return AF_INET6 addresses even when + * netstat(1) was built without INET6 support. + */ + if (ifa->ifa_addr->sa_family == AF_INET6) + return (true); +#endif + return (false); +} + /* * Print a description of the network interfaces. */ @@ -407,7 +423,7 @@ intpr(void (*pfunc)(char *), int af) if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0) continue; - if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af) + if (skip_ifa(ifa, af)) continue; ifn_len = strlen(ifa->ifa_name); if ((ifa->ifa_flags & IFF_UP) == 0) @@ -478,7 +494,7 @@ intpr(void (*pfunc)(char *), int af) continue; } - if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af) + if (skip_ifa(ifa, af)) continue; xo_open_instance("interface");