From nobody Tue Sep 29 18:55:36 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 4hvS714TFrz6txLv for ; Tue, 29 Sep 2026 18:55:41 +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 4hvS712mN9z4KJs for ; Tue, 29 Sep 2026 18:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790708141; 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=aXQtD1lJ0KaFz6NwhCUlJCWsHTisP3sQlAdJxmdfEcU=; b=vsipSb46Y7ebNa2BDy2xBAPBljqB9YSnGmCiCCLn6shC3sKxlLZDGrSDxZIfOsvXyqoR4s I6NllLzzsRBh6yCyV/7robpEudY/k0OeUrqY0SIfuLqpYTcmO/hz86V3HgBfx8RoSwUwlM oUr5bxPczrHYiIzH3oTA3HzrR8IJdUIjMMogz/djhcnx1Fft/Ora+7MPl/CKv98ih1GM3h levmQsoBhxhuma/lK65Wleed7/2in1K1vmIZLF/4HZKT9z5jzFm7PWKciTC7P8MT3fcC+d bjS9cu8WI5fPSc1BUS4s6IwkZbLT7fdLYJPoNMSuyVB90WuGj67okjrcTbDrqg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790708141; b=idM57ZnQLfipMnjGQ6gGVAHAbX3OzZVXjGMowZeSvv2Lu5tMIHqNDWQHaXaoWLw+dEPK8C 0masBCk+aR4ElvcxyK/MKb/vJYKbfdSq0HuK1idiXHdukGB8DXVoTFRvTR6HWf0d1cSZJL 5qOWwdedAM48C3uj41gkjtOM7rt2lGbQLRo6nqzc33lNsa9aAr3OupA+1zi9+0/dMvgKuo +JAkE2PaICpiO+k9iBIYBsyjQmyEEePbF8gyHDbB8XcShkDsLDOeObsYo1pKDGYOVIUp64 ShaBRN61rizpTD2WXpuuv+E049FPUoXYwmKGkUhT7F0cQP2LSMGZMuiQuv3ZUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790708141; 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=aXQtD1lJ0KaFz6NwhCUlJCWsHTisP3sQlAdJxmdfEcU=; b=pzF1r0bELYhY2648GykjqFTbdwJCif+A5JcGgFsd/45ciNKKfRn3dfyWwLd0eFPNFx6Dc2 ft9RCm7U1m0lwDImWE05vzC160oJuO5hm/rJH4iRE5d19++LJQ0NKb13XCp8AkZG3TowVi ZKFC68TOHwXNCIuvTpmJva52cSjhqpZTJl+iH0bQgEJ2Wh/qptKyqYZ9LkJMoXcrYPDdVX +cpzKDBv2jNCcsiDicy3znBzMZbxSz1Ll6tT5tsAIY6aqhjYwSu0wELxMT7Jmh7OlLZI4K OlboX+f5B8NDelfzcqLZbXK91gmdNpYqPz1w6byfFq/FjUTfX3Drg/M4eaKOJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvS711sGPz1Pyv for ; Tue, 29 Sep 2026 18:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4282d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 18:55:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 10729d0ce11c - main - net: Fix handling of sockaddrs in the SIOC{ADD,DEL}MULTI handlers 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/main X-Git-Reftype: branch X-Git-Commit: 10729d0ce11c9ac5077d158bb372f9c39053f168 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 18:55:36 +0000 Message-Id: <6abc09a8.4282d.64f66c68@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10729d0ce11c9ac5077d158bb372f9c39053f168 commit 10729d0ce11c9ac5077d158bb372f9c39053f168 Author: Mark Johnston AuthorDate: 2026-09-29 18:50:02 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 18:50:02 +0000 net: Fix handling of sockaddrs in the SIOC{ADD,DEL}MULTI handlers The SIOCADDMULTI and SIOCDELMULTI handlers add or delete a link-layer multicast address from an interface's multicast filter list. The link-layer address is passed using the ifr_addr field of the request structure. struct ifreq's ifr_addr field is a struct sockaddr, which is a fair bit smaller than struct sockaddr_dl (though big enough to hold an ethernet address). Existing callers set the sockaddr length to sizeof(struct sockaddr_dl), which is too large, and causes OOB accesses when if_findmulti() is used to compare the address with others, or when if_addmulti() makes a copy. Fix this without breaking compatibility: copy the user-supplied address into a sockaddr_dl on the stack, and use the latter for the respective operation. Also validate the sockaddr_dl internal length fields, suggested by zlei. Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.2 from Z.ai Reviewed by: zlei, ae, glebius MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59919 --- sys/net/if.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 084d0ffb8a65..d8184a528f08 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2853,6 +2853,9 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) case SIOCADDMULTI: case SIOCDELMULTI: + { + struct sockaddr_dl sa_dl; + if (cmd == SIOCADDMULTI) error = priv_check(td, PRIV_NET_ADDMULTI); else @@ -2864,9 +2867,25 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) if ((ifp->if_flags & IFF_MULTICAST) == 0) return (EOPNOTSUPP); - /* Don't let users screw up protocols' entries. */ + /* + * The sockaddr embedded in the ifreq is not large enough to + * hold a full sockaddr_dl, but existing callers of these ioctls + * will set sa_len = sizeof(struct sockaddr_dl) anyway. Bounce + * the sockaddr into a sockaddr_dl on the stack to avoid + * potential out-of-bounds accesses. + */ if (ifr->ifr_addr.sa_family != AF_LINK) return (EINVAL); + memset(&sa_dl, 0, sizeof(sa_dl)); + memcpy(&sa_dl, &ifr->ifr_addr, + MIN(ifr->ifr_addr.sa_len, sizeof(ifr->ifr_addr))); + sa_dl.sdl_family = AF_LINK; + sa_dl.sdl_len = MIN(ifr->ifr_addr.sa_len, sizeof(sa_dl)); + if (sa_dl.sdl_nlen + sa_dl.sdl_alen + sa_dl.sdl_slen > + sizeof(ifr->ifr_addr) - + offsetof(struct sockaddr_dl, sdl_data) || + sa_dl.sdl_nlen > IFNAMSIZ) + return (EINVAL); if (cmd == SIOCADDMULTI) { struct epoch_tracker et; @@ -2880,18 +2899,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) * already exists. */ NET_EPOCH_ENTER(et); - ifma = if_findmulti(ifp, &ifr->ifr_addr); + ifma = if_findmulti(ifp, (struct sockaddr *)&sa_dl); NET_EPOCH_EXIT(et); if (ifma != NULL) error = EADDRINUSE; else - error = if_addmulti(ifp, &ifr->ifr_addr, &ifma); + error = if_addmulti(ifp, + (struct sockaddr *)&sa_dl, &ifma); } else { - error = if_delmulti(ifp, &ifr->ifr_addr); + error = if_delmulti(ifp, (struct sockaddr *)&sa_dl); } if (error == 0) getmicrotime(&ifp->if_lastchange); break; + } case SIOCSIFPHYADDR: case SIOCDIFPHYADDR: