From nobody Thu Oct 22 17:32:00 2026 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 4j9Y9s5k5Rz6xPP1 for ; Thu, 22 Oct 2026 17:32:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9Y9s0kTWz3GqG for ; Thu, 22 Oct 2026 17:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690321; 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=IiqblJhdpwbJ6msiGma5A4FvcXFnKn8tlHdCiCViU74=; b=KWT69Hy0tMuVPTQIFThrsZ1QYa/HSeqKMthCEU2N4S3rKOrsktxryHUHIyUq7Xx2XfENEF bVZ/3RGAPjGaS/HMfQcKeChCu+1zKMAuJ7nRLoSWyETMs85QbZwDiCzGs/PCo2/1o2NFE6 ijoOHaIePXLwxcgWlFdzwCj6lqpPwYKppPHzSfkUkWK+4S/dLtsT92x+/DLOdAASCyj1Np hp3fxVudqXmpLb9xYHFbxE93Fngefa+0AU+qY+p+9iWq86UJWqtseD09XX5UmvltfnjF4s H7dO9Cex09fqV/uKce5Gb538GxLSZcMREqSY4kvTAMMLiVQUi5xAW2EmQ+0yfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690321; b=l89W8E+vDy42W26TO1x1/dAAxlu7aSBL+d5ueQLQ6uMzox/5WqFE4m5/I0Q3URl8/NX18/ /jQT4s3WAfrjBIdMRje3zO6iil/e29PwwQ5LWcLSwPQqLIWXS0lKl0vo1aH9mH18IwQw3/ azmie9YssJ0w0TztVyOmf3a1TJ4YyuCVdLZj+VWoBUJM24ftu715cRRz56353sS9JhbbWF kclmPtr4tqKKED8ndZycfrfx6Umgm7CAMf2Laa3kT/cJX96erQT11eh4pck5zpqppiIlTN AxTjjlsA/TSPddy9oaO2ggyXTMSuiBpX+JkL9ex0sdNU0qQrf6UoR5UAygI5vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690321; 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=IiqblJhdpwbJ6msiGma5A4FvcXFnKn8tlHdCiCViU74=; b=hWZxuIqOGSbweviAVUO9bL5w8GrPOVxvRVobHXQPBudfLThNpaZQrpiHeWVX6N9Zzmf0o9 udljGWWJ4s1gYosOj9pKR6KYgykP+CDQVXF6qbny7zeYOq9GK3VFa8wqfJ/b1RxbpTv7Dr H7rAzgASrY/B4VTD2S03z38oHwY+3ri3vE/JS0e2XwZ5XZgB83PzUE9kBRyRjXV1wWY0m1 VYIwce2qJfNQJI+iIbrcgegdPvrDQyB5TIZ4+YjI0y/fxtc9+r92Wq7lcVerRdyJfsMgdm 1pVgE1orag09HDTnqFWAsD4yFpZFtISEzg0zz1w/Kb1LXlkKgVslHm0/lo9D1Q== 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 4j9Y9r6wnbzrjG for ; Thu, 22 Oct 2026 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aa0f76426aa3 - stable/15 - net: Fix handling of sockaddrs in the SIOC{ADD,DEL}MULTI handlers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: aa0f76426aa37108f16b0a8c9da4a7d57504c7aa Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:00 +0000 Message-Id: <6ada4890.3ce4d.3fe3fafd@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa0f76426aa37108f16b0a8c9da4a7d57504c7aa commit aa0f76426aa37108f16b0a8c9da4a7d57504c7aa Author: Mark Johnston AuthorDate: 2026-09-29 18:50:02 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +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 (cherry picked from commit 10729d0ce11c9ac5077d158bb372f9c39053f168) --- 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 a38998b5c02e..6267afafe361 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2781,6 +2781,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 @@ -2792,9 +2795,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; @@ -2808,18 +2827,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: