From nobody Sat Oct 11 15:22:37 2025 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 4ckS661MgBz6C31H; Sat, 11 Oct 2025 15:22:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ckS660kVfz3Hpc; Sat, 11 Oct 2025 15:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760196158; 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=sSbvN1MBX4xfUC0mGWx86xSEPXTVts90pXA5ahBgao0=; b=XKW55qVuErgkp6SbpRIxsvPEgvdA7JEQyozA3hXGCcLHi4UTdpZ3Vqt5gkwoPZYyFKMKm1 FFD2y/UYf3Mev7JrEHMKIBf95GJwM5iLh6f717BuspVJeCf4Uj5v3fZc8mBUzr5xESoGgw jcuerjRFqj0Ay4Dr5Tbzgxtet5Um83/JJ86rlLHK29sjcRMHUW4aoG0cI9jry27A0447wX 21gOSsVz8jS7sKd+oaZIZucuBIJaIm9bZZn6nRa+SsJHDY9oniY8HBe1TwJFPhv+rAPAdc 5QP/Ni9dxONyNjcqmP2ufZMD+2GzRlpa1z3YEKpHxHEw3t7FPhXn3y0faztUOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760196158; 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=sSbvN1MBX4xfUC0mGWx86xSEPXTVts90pXA5ahBgao0=; b=RUMV86PAvf10S8CvATgRKuDuAnZP2FSuRAm85roYP+iFFFyygzzX+/GT70G6NoI8FZ5da8 KbiZrOt2XYG/9wyFpyTcEoAYzKilWwR34HNE8XlciYRNLGb1gavhTUybamkFq+Z4x+yqM3 JwpyfUVUylU0kMbIpzwdTbBPrMHzwCLO5FuG61VS2EXc3e+QgFrvRofA1ON0FoCumBPSD9 hUvYpFThBA+xyVpTE+hSsZjrzkAVDBQe1B+Y1fRnttiYL4ji5iZT4NdfLRVkVry0d6gGg7 jIcqSfjPNuab7uL8BF1KtSNqe+BseR1rJ0DpZl7TLtu3M4H+7HZ9b+9wFrTpyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760196158; a=rsa-sha256; cv=none; b=J6gIMKGt5VXkg0WMioVkTwQuBxEw8FHKArqYxqxiU+mJLqkLuT4sswNbhnRv6gObyWhCm+ 3Xd1fOpfVzznQE0m6Elc287fSRQdf0I2ww4MZdp83+67GVIFMdlMjawqrkdbhj5B7gQF2v dwx7wmubk7PSZsmXPRat0q79ciHVyPBtn35D185XIjGpC1WyoHQdKFlB3UyeaXUPRYjeId NbRXnZqlDiXgcZAnmBU6DGx15yLeTyLtJkvi7qBevyxjwxwAwbUvL62ElnwmryEqZteXSM 2NzS1jgyH1SVzfv53Vuyajrr/7wulAbFEHT8LbIBi+GySkYKZe/bZSMy8yDeRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ckS6602cHzgFF; Sat, 11 Oct 2025 15:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59BFMbPn015277; Sat, 11 Oct 2025 15:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59BFMbcp015274; Sat, 11 Oct 2025 15:22:37 GMT (envelope-from git) Date: Sat, 11 Oct 2025 15:22:37 GMT Message-Id: <202510111522.59BFMbcp015274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 54a72bbaee2e - stable/14 - netstat: Fix -ia missing multicast addresses on some interfaces 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 54a72bbaee2eeed26f8a06bb28a1fc52f24789f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54a72bbaee2eeed26f8a06bb28a1fc52f24789f7 commit 54a72bbaee2eeed26f8a06bb28a1fc52f24789f7 Author: Nick Reilly AuthorDate: 2025-09-12 19:27:59 +0000 Commit: Mark Johnston CommitDate: 2025-10-11 15:21:48 +0000 netstat: Fix -ia missing multicast addresses on some interfaces sdl_data isn't always NULL terminated Signed-off-by: nreilly@qnx.com PR: 288958 Reviewed by: markj MFC after: 1 week (cherry picked from commit 0952943a680dca12fe8f65f8813a9dca0783ce88) --- usr.bin/netstat/if.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 2ac36fde94f9..2d6e04422ed1 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -260,7 +260,8 @@ next_ifma(struct ifmaddrs *ifma, const char *name, const sa_family_t family) sdl = (struct sockaddr_dl *)ifma->ifma_name; if (ifma->ifma_addr->sa_family == family && - strcmp(sdl->sdl_data, name) == 0) + sdl->sdl_nlen == strlen(name) && + strncmp(sdl->sdl_data, name, sdl->sdl_nlen) == 0) break; }