From nobody Sun May 3 23:52:06 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 4g81lq16mTz6bvtC for ; Sun, 03 May 2026 23:52:07 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g81lp4nK7z3gwL for ; Sun, 03 May 2026 23:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777852326; 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=RwItIPy3e4TBK/UwYeYIV/TZ0M+yzg3K/TOLm3VLZqU=; b=nZNArly0V3qk3y4KFxuCH4j8cEzzyuqIbgIgx7GjC0ildMgSo0mheUDasF8dhyBAQh0/el wH90n3z7gBJxrBIxPY0JKRg2+OAEOYpd15z+zhsf+xqqNswyVP+HOOZ+roTRl5fJ00c4UL BSqHUulUbgpKUG7vYuh4biDwCENqlPs6vP5MOCcQ9j2rzW1F4Km9BCx2sec1kefqzQ3uBb DJuviPZY5riUpa+g7gGR7EtQFuIPYMisi6YYzpB3o7IAYp/sedgje0HieZxXa3aaKxAd1Z MBP9GjHTm71W07wH1pVYr/cKapxlIG9r9MDhdEW7vrmTn1GhWbAPfo7f7SF+mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777852326; a=rsa-sha256; cv=none; b=DGy5PJBBdBw6PUICKEK51Id9J6ZEv49eK9pZWvnIGjeS0MM/FGjSHq7GecHoqJIAwgam+M doO5TgWJBiv41RaUtnuaDhuE8fbA306nQAKH9UHx7qwlUUBoSM8oyZAk6fT7tmLstjdBlQ 4/Ev9nIKQupI26kmMmmY/yeq6E1t9S2S0yg6TyzBWcCTczskxQt8Jt38NX/0BQ+m8qewNz 0FbktGga0xZrmF2IunoaJlPC0aJVroUYf7VuEyHN8BNeEta43UAjj72Gx48F8TOtjW3/1m Z7hD1lFLXIbOW9xBx65BUH+z5Qlp0334eoUMka4YDVsfpHydDMs+4KOVnmqzWA== 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=1777852326; 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=RwItIPy3e4TBK/UwYeYIV/TZ0M+yzg3K/TOLm3VLZqU=; b=fiYRgytVQkrYiYKy9d+wB20rI9ONxRMzn4/sV8o5xgDxfkt2N1uczMV7u3ndW61DX4UfwN s39PbQeD2qMo3XvXoXRDdM0OBB553p2PN2ucD0T1EmIaHdLskEg26PO1vvAANGQECXredb sa1BaXOSodRxhCDzwoAJUnNsoEZ5o2ynaCXywQWjdD9lm8zUrFYjzRWLnM8pamLXtqfaeo XjWU9SMZMH5opBC2FyWOAClbcI6A64h+7YhU3MbES1+u6G5wlnjMogBaReo4LixclIJNjR xRYJqYeRyxa5/Ruwo9KDjEhXIgQN5/87zKWtVJtht8Fa/pIacr/t/3Cn/py2Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g81lp4Kn8zw4b for ; Sun, 03 May 2026 23:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 23:52:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ef029e42181f - stable/15 - ip_mroute: Avoid leaking uninitialized bytes to the routing daemon 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ef029e42181f69b1097755a8ea8b1de986e10005 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 23:52:06 +0000 Message-Id: <69f7dfa6.31c23.41eb3bf4@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef029e42181f69b1097755a8ea8b1de986e10005 commit ef029e42181f69b1097755a8ea8b1de986e10005 Author: Mark Johnston AuthorDate: 2026-04-24 13:22:51 +0000 Commit: Mark Johnston CommitDate: 2026-05-03 23:10:53 +0000 ip_mroute: Avoid leaking uninitialized bytes to the routing daemon Reported by: KMSAN MFC after: 1 week (cherry picked from commit e0751ae801b3e29c6dd52905ef1d63d5cd643b0a) --- sys/netinet/ip_mroute.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 43c4c79c4e9b..18d26735e339 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -2460,13 +2460,14 @@ pim_register_send_upcall(struct mfctable *mfct, struct ip *ip, struct vif *vifp, /* Send message to routing daemon */ im = mtod(mb_first, struct igmpmsg *); - im->im_msgtype = IGMPMSG_WHOLEPKT; - im->im_mbz = 0; - im->im_vif = vifp - mfct->viftable; - im->im_src = ip->ip_src; - im->im_dst = ip->ip_dst; - - k_igmpsrc.sin_addr = ip->ip_src; + memset(im, 0, sizeof(*im)); + im->im_msgtype = IGMPMSG_WHOLEPKT; + im->im_mbz = 0; + im->im_vif = vifp - mfct->viftable; + im->im_src = ip->ip_src; + im->im_dst = ip->ip_dst; + + k_igmpsrc.sin_addr = ip->ip_src; MRTSTAT_INC(mrts_upcalls);