From nobody Mon Oct 26 19:46:51 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 4jD3zb72rQz6xWSv for ; Mon, 26 Oct 2026 19:46:51 +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 4jD3zb4Ftjz4qVT for ; Mon, 26 Oct 2026 19:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044011; 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=LWYzGjP2Im/QmP+GVfRSCshGl+Dmaelw+UzoO+9+S2Q=; b=q+WgvuPfTdV2LBx4bRHdlMka1jtBZTs2b+bseHEOIfVxH+wuFsr3qJi3c3v/kCzwY62LJ8 gyHlPj6hQcOBr5mn6ipEPNkBSYlxqKoJpoO9LGyEzLk77iKVSodXZ7bSecAmkki5ghWcQf 5IBq9tbdFfm3PHBaSJ9DB4bayJy5ow1DCyAvXKFJi+0/f0qx5HIFjLc9wsjnyFXugi0hNF tf6AM12mY+ONWOtYklxtsII++c6hBjMnoT9sy2puXLH4Yg4FdTd9BWq7hGMPZ3sq+Ml2FN CCsxy9PlNjRJNC3jkbWVGaiywxCgDK9DB+1o+pwEQCQtgSyaOs6GZih309mjCQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044011; b=qtvQn9D94JOJxxuT84Xd+esEqbTQbGrxmONGDHkWNIXn2JW8atSQMjJ6h2fv6CCY6ME54m IW55cqd5qAmFERVBNJtEdIiiI6wSZLRuRWz6KClcp9AKB6hy640zCPuuaWYq9Lhh5QERUQ v76/shX6E7dvJGG/0eRvUDAAa7J8sXBiYTeTH2Wr0EajQ8RI0vU7nrhYOZsvW2hFyhS+B4 OJtadd06XBvow5c433VZE0gV8S2g5shN6NE3poxp0L/d2DGv7vd8I9gEqNvRriYNhmwaSm Fh1PlF49C3h7/wDWzri033IYAoPoqIJwwg2qyETVKJzxKF1HstK9H1HDlJjaoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044011; 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=LWYzGjP2Im/QmP+GVfRSCshGl+Dmaelw+UzoO+9+S2Q=; b=v9WgCFKHBAcfjsz2DajJNZTyftRy7DlabnD5AYfyoiiUheL8wMuRBcY24Tr3AcGEPxV3Xi RH89FECnwRrKM5Jl4ldsLU02h3OdEQTbW3F6iOrbIFeWIODItygSFNF4ND1S2JGWlXyPSA afZ/+EbMjzRXMET3pOiVWK4dsuLX4W5ERX36OafWHIZYY2x68lWFMGB4BMBd9HwoLqz2YH Yeui6rf+bEH/NDTyKUO4SKGCi722+kYXq1q0goaGYiJeVo0EQx2DPGl9Yy+1iW8bqIm69N kcmtKbL+pVxEPWjsG3fJPC9of0sSmumLtzKGbvAK96EqKYuRaOORLY1vIGnGAw== 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 4jD3zb3m8Fzp9t for ; Mon, 26 Oct 2026 19:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3941e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 508c057281e9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 508c057281e93a368e5bf5e41beca5dc2d74f772 Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:51 +0000 Message-Id: <6adfae2b.3941e.351006db@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=508c057281e93a368e5bf5e41beca5dc2d74f772 commit 508c057281e93a368e5bf5e41beca5dc2d74f772 Author: Mark Johnston AuthorDate: 2026-09-29 18:50:02 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12:15 +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 7856f53a3cea..e0cdf7c04674 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2776,6 +2776,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 @@ -2787,9 +2790,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; @@ -2803,18 +2822,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: