From nobody Wed Oct 22 15:49:32 2025 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 4csDB462B1z6Cllk; Wed, 22 Oct 2025 15:49:32 +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 4csDB45NZ0z3QS1; Wed, 22 Oct 2025 15:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148172; 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=+F9TxegMvF53ro+fHc9DzA6jXMTiUmMqh47cIhUEe9w=; b=RlOU4Q4fQqSf0P2akPSEjG36DwTVwBa0o5u9lBjiZQd4ayfqMUV/dIyHXCH+T6gmRkO2Ba n2KnwjAzyMHpFwpW/7ouuiBjggHPY9KmPAgWsCLXZS1WwR04jCKAIwf+5o3IafzduTyxb2 XE5XXuYUvCNxsx2ZxZXJ9GyblcoZECfuPUoRhtconfx/SVM9IBCSwoLrGojMBxlcnnATMY ultkFqsPs0Meb7HVn0YzRbsfVbn1mWwiCZ33wp9JZXfUX0CznB+lvfYNnkaOqE1FyP1FFK 2uFf6exeg2pKqyPgcPlMBJluAK4lFwxz0TKinT/sbEj7NZGFMRRHse7d35RpUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148172; 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=+F9TxegMvF53ro+fHc9DzA6jXMTiUmMqh47cIhUEe9w=; b=eKI9EKaQC8Lf6G/0aTYDMh+tbjHxBaZB/ggi4JuF9rv8mWXUGwuRZqvm5JCRVmm7Fib+MS Dz9fZyWbQoDnghmjYZCU2uzXR3JhO7UD3suE65YKbokCz5IpvCx41bxM6WQIT5N3xof/Ya 0aQBLtlyOXtOGzIto5vYSSHL9KKkfXrtpqsUYEoZo6O6crkwYo03V6TqQba4xUucAXvPTV 5M0q0TTo1Ub2Rch68tJKxFQOtx35sdgfFk4+dzVPIE0u5LdApmUKBEtNqoF2E/y0Xo3JK6 l0dSI0bgYHWQUkDJJomH2Hlb94B5r0F6eoTb6aQC6UlnHsZx3rWK7h3XINHn1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148172; a=rsa-sha256; cv=none; b=QKkozGX+WoAIbbqFSUXYIH5+4B2AV9Yl5rKzzhotgoHmnhit3XjnV8BtT6KHzmImTRuJFY zDd8alD9wBLowZTJg4JIl2Zd+3aGK1tGzeFiLU9MzPjtPrNipeBX/dHwHCEIb+LeMlzFH4 SA6e9CFgE6+py8C0IrTsv6wjUV3F7VfZ9UWEbsIEGwVcB03a9bQdLRUk+x5+G1pNfz9vbV HosUYdX9cNHDblzn5lXBde3ZCJNFD2h/U3SfNkMHHzZaggx2PTOXTVYjbEWP1T8RaN4S1b na0hMekSGXs9oi63LI9v0/pGYRRq1WV829vnu6LWjxU+yWFDZ90c8Te6k8m6Bg== 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 4csDB44qxTzbjV; Wed, 22 Oct 2025 15:49:32 +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 59MFnWiZ022809; Wed, 22 Oct 2025 15:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFnWP1022806; Wed, 22 Oct 2025 15:49:32 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:49:32 GMT Message-Id: <202510221549.59MFnWP1022806@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: df888c8f41f6 - stable/13 - inpcb: Ignore SO_REUSEPORT_LB on connected sockets 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 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/13 X-Git-Reftype: branch X-Git-Commit: df888c8f41f633be3aacecdd357ebaad62aa11bd Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=df888c8f41f633be3aacecdd357ebaad62aa11bd commit df888c8f41f633be3aacecdd357ebaad62aa11bd Author: Mark Johnston AuthorDate: 2025-10-22 14:49:25 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:49:11 +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) --- 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)];