Date: Sun, 03 May 2026 23:52:06 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ef029e42181f - stable/15 - ip_mroute: Avoid leaking uninitialized bytes to the routing daemon Message-ID: <69f7dfa6.31c23.41eb3bf4@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef029e42181f69b1097755a8ea8b1de986e10005 commit ef029e42181f69b1097755a8ea8b1de986e10005 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-04-24 13:22:51 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f7dfa6.31c23.41eb3bf4>