From nobody Wed Oct 22 15:53:35 2025 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 4csDGl6f9Tz6CmQZ; Wed, 22 Oct 2025 15:53:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csDGl66sNz3Tq0; Wed, 22 Oct 2025 15:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148415; 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=ZgjNn9eq6Kly7O+g+x7IjNYqdvOqdV+xmHbqS8/gVBU=; b=QvVwPmnIaDfelW0TbjixQjt0cuiURxZE1Q9wAP0JGE+URirMLvBEPzaks1sULuHPpHT/gJ VVDxtSHa+TZhV6xjTXbB+y6wvT2UqzhQzwHSEr/8qxKaHjPQakwlajOCfOqDr3tu2hE7tL Slzl/ZFxb2d8nMMCbUHmdrJwNj4sR0SNBS/oAC2nxC97Jf1Rg4cpvhvtz6rn8OqV9rTCub 3eXzgx8+fv/Fp1Ebq/t1YfD35v4t6i+/zpP0gj7EkgZaJriD2rkDFS+k7nM5eTjWN+a6+v s6Q/imposmMa6cYSaUjk9C3Si0H7Y7EDJxPC4KxTh0868IRd7+oxFquEp7XckQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148415; 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=ZgjNn9eq6Kly7O+g+x7IjNYqdvOqdV+xmHbqS8/gVBU=; b=lv9jJAD8WvLGpSs3gS4pqhQlw3/mciNha6vLyvIw9Cky9/gmIfIrXPMAlDe3JySF0eh0RQ 7FQm6yycsNoud1YabkKvPJK3LynYQtpCLscJscmRHO+3ffhTQE2IDg7HJPCZi84xYqRXPU Xaxpux0hMqPfZuhB+sdJykTsYNORzFzagjE/A3ZSfIS3XX/js0O0fMxWycVe33Mc58ny/X iufYQCxKhHefq8nbxf1gQqWbyb9cjpxFHd1eXZnwkqhHbWoKI61aR+gv4EAStQbdI0NsOl GMsTfqJn+KOrP9bubJwMeeh7Y/C8vrLeRVsTsZrhSPC6RewXywDvG4H6kVMyuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148415; a=rsa-sha256; cv=none; b=eZoQ8GJJd3hOTn3y18M57WTcEdHonCSsfc6jiB7ZHMYhue4W40Dyyuh/MXHtr2jvbILl2o ZWS1JakBDxkyruEnyl00NTxsM6SaIvKVLmtLMzNT8/wDZ25MZa1dF4BU/MSipMCCzI7j9H 0BT6AYKp575vgazb+DYZzceNlYBKfXWE7vSj/QcebMUzh3J9Z8HX9KfFcho3HSWi2Yla+D BDnbF9OoISqiZhoM1UCSOyM3hsaXAiXDIDMTedLjFJ0cwmY9epwY/5i0gjGns1C6GUYCTn ftB68xu0VnA/uCMtmgD+kD/vwQLb1nb0baGC5bbnekauwePm6Al50jm+kC0weQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csDGl5YHNzc0S; Wed, 22 Oct 2025 15:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFrZ9t039865; Wed, 22 Oct 2025 15:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFrZ5R039862; Wed, 22 Oct 2025 15:53:35 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:53:35 GMT Message-Id: <202510221553.59MFrZ5R039862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90e14aa082d3 - releng/13.5 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 90e14aa082d3f90c8a805dc0394e1db851859835 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90e14aa082d3f90c8a805dc0394e1db851859835 commit 90e14aa082d3f90c8a805dc0394e1db851859835 Author: Mark Johnston AuthorDate: 2025-10-22 14:49:25 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:52:57 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) (cherry picked from commit df888c8f41f633be3aacecdd357ebaad62aa11bd) --- sys/netinet/in_pcb.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 03315344a455..a6fd5feddf9e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2668,6 +2668,7 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2676,11 +2677,15 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) ("in_pcbinshash: INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)]; @@ -2689,10 +2694,12 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + if (!connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2761,6 +2768,7 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbhead *head; u_int32_t hashkey_faddr; + bool connected; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2769,11 +2777,19 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m) ("in_pcbrehash: !INP_INHASHLIST")); #ifdef INET6 - if (inp->inp_vflag & INP_IPV6) + if (inp->inp_vflag & INP_IPV6) { hashkey_faddr = INP6_PCBHASHKEY(&inp->in6p_faddr); - else + connected = !IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr); + } else #endif - hashkey_faddr = inp->inp_faddr.s_addr; + { + hashkey_faddr = inp->inp_faddr.s_addr; + connected = inp->inp_faddr.s_addr != INADDR_ANY; + } + + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport, pcbinfo->ipi_hashmask)];