From nobody Sat Oct 11 15:22:56 2025 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 4ckS6S6hWmz6C3KG; Sat, 11 Oct 2025 15:22:56 +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 4ckS6S5fJLz3J6l; Sat, 11 Oct 2025 15:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760196176; 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=gw6cEaHOiuXHFthjAL5dmqnMU2SkkathL5oDzZG9qls=; b=kpW1IZG+xOvWeaIdviBc1IKy8/78WowLpd2YqxqtHodqZJr5aX7CXUtH0uTSHsrAsmzp1m pXNwTymUOEYyITPrDGktkiDzxQYd79+JXomtH2JyXeiac0Mc3qUo2aFMjz2eSqB1G8vC0b QgdAo+O8iKvbxTtlVCsXqiL+2IAPO4yGl1ZJmeGiEjZCOblX3YFs6wWFtURMiYqlzA017+ 5gLUBHfhhs+twmIOxnwWrpU8hGN73NiHmj6+xoQXQF//LQ85oqaP0eTKW5uCfJFBnaNFeI s4fXiuDv82nO1ekXw2Mn7oRxJHAuIiR0/VSaWKs3rrc3/x7rRcv7WZBQZq7VTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760196176; 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=gw6cEaHOiuXHFthjAL5dmqnMU2SkkathL5oDzZG9qls=; b=nGWu6sHdkyjsypwkNP7n9oAR01m++rpacMNDFApGF+MFQTWz8OFnAo1zR/7A7wkO4qr6JV SlxlpsW52W5WeVRuQtHvC7bTGPGaAtAK9t102NLnfbjbwj1yz996/LEHnJ9EZfhYSE8Vtt zb2dAI/4qKPLbTROjEuZfqDjDkKLzB9jr6D6Swtyv3YzL0wB0zZPi/jb/yAtnsir3c6Ydz HCnKQAQpoaXd/HsvC06CSf//4YTBNEMdBj9hmpoe4E4A/FGmKI9kVw/fohY/NwmhHI1eps oGWdSCW1SltDgiwOmod2A8e8BIwRkLW3C7IqzJdLlhfJTXfhcXrh7PtoQai6SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760196176; a=rsa-sha256; cv=none; b=cIhj0wWp8jfccwSZhH03YDKEXm99u/O68hl78S+b6AbiKMfiRykGzFpRpv4enp5TMwqpx0 4t/rUzpEoWwfDbmyuFAZI1525UaWC5hVmBUTF93DsvYcGFhJzVpnbG8m019yxv4nT4OGYt j6P644FUHQgr8hAT1gXnqHQECn+itGpC68SlDoAzRGmgIXDikJ6GkFIpgfeaZhe0jF1chN O7I0BATt00tVPcEio0PURuiFeTKwOya5Os3Ea6wg9CjddKgwB7oNsRJl5W9B44ug8TjWz0 /P+pwDPj3Tf1u1jE7VPnPAkk0qKnxtFZ1jd/tDQVh0x3AHnaxbl66+sKWm1mYw== 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 4ckS6S59vQzgj3; Sat, 11 Oct 2025 15:22:56 +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 59BFMu9I015500; Sat, 11 Oct 2025 15:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59BFMuTO015497; Sat, 11 Oct 2025 15:22:56 GMT (envelope-from git) Date: Sat, 11 Oct 2025 15:22:56 GMT Message-Id: <202510111522.59BFMuTO015497@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: 146b7bb2a111 - stable/15 - netstat: Fix -ia missing multicast addresses on some interfaces 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 146b7bb2a111b2d01dc4ce555237a724de27f6cb Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=146b7bb2a111b2d01dc4ce555237a724de27f6cb commit 146b7bb2a111b2d01dc4ce555237a724de27f6cb Author: Nick Reilly AuthorDate: 2025-09-12 19:27:59 +0000 Commit: Mark Johnston CommitDate: 2025-10-11 15:22:45 +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 622141e4ff69..7ee03eb3689b 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -282,7 +282,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; }