From nobody Wed Oct 22 15:48:25 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 4csD8n30fXz6Clj2; Wed, 22 Oct 2025 15:48:25 +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 4csD8n2QPNz3Pn0; Wed, 22 Oct 2025 15:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148105; 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=QYW/6/sxcxEqwp56cxRjWBpV06U1P/46E5QCWFu1wfY=; b=HjBdPkl4Ojx4espMYY5Xb2uvjvCvth8Jt/ntvM3eV3ixaK4aljFkAgaqmzgRvkCYJq4SFE g/sdq48q9bTggzyyZLlbAcCvDOA7zFp8D6d9Bt4KV5AuI3mRCryBddMGd3lAWmKBGjEl0c wj2WrVLHrMYXLd3rS4lKB5kwyDv3w5tPHuoeTyyHtMoAlfUAlT9BGn9d+pc2fl/IeJs9xq VgrmJB5+I/j3YKwUT5kHtefhnVabSkLTb7meey23zw/+10FYCy2LFTzsKxsBC8jA5bB6PC kraznTcEmaNi0+UETQJCm4PdX96b9PeyY50FESzHfJXA71iOphOQ8tH9Efe2VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148105; 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=QYW/6/sxcxEqwp56cxRjWBpV06U1P/46E5QCWFu1wfY=; b=LIc8JZ/LMQtBjXedCD1TKNO85Byx0quQM5g19mXsVumwg0NpsbK4pg23Vh6xxGowcwjyD0 Q1dIVxgtve/zg6nY6mU4FRvcnOZG+C6+K5EH90hOoBTJ2HJOQjERhADeuXXLSMAJ8xbuj8 hqttC/gRIcKpHNY7iWGwJUuKycpGmWQy5nX2utpdrJsh83iKsEWIVNX6QjpcSnNhDmHvQl ta0M6trpgYoZPPqlH3SJAZrx44jme6FvGIGBQdbeD3zi8jqomg7ZDPgWnG7GUu8b+++k9e ejuDBmVsj6Eskvtjh0ykeVv5CJ3OGs8UdKVCD+19TU3qgN4EYl2zYpka/B60IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148105; a=rsa-sha256; cv=none; b=q7a1c6vWE3LL+FA9o5ABaY0eLpHyBafyZmJskM6u4Q4A3tGKLdOx+rvUksDrdSbj9oiyfG 8gzlKrpexzT8W4VsbuQCP0LT6bocTA/Mkec9u1nQUPPK0HuR6kyB9INh/Nl9G60gpphJET ttM5JPOcf2elrf0AatAAfWFIsN7p/249dkC0yOlSFv5gKpqlfo9VvHQMet4thPLmlPLUtf FFVzj++FNwRnPOduLFPg6VVakL55YdXWiOk/oARCgO4TJOpY6yrKAYTNAlpoFcTKBNDDwE PrqBelgEaHjP8R1LIe61J2XWfsfpKt2D465dMACOsyEsfiTw5Z9ELM9gzA+ZPA== 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 4csD8n1rdTzcD1; Wed, 22 Oct 2025 15:48:25 +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 59MFmP2f022169; Wed, 22 Oct 2025 15:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmPtk022166; Wed, 22 Oct 2025 15:48:25 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:25 GMT Message-Id: <202510221548.59MFmPtk022166@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: ef159100ec2b - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ef159100ec2b73c22caccc00555bae4c3cbc0ea1 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef159100ec2b73c22caccc00555bae4c3cbc0ea1 commit ef159100ec2b73c22caccc00555bae4c3cbc0ea1 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:01 +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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dbe48242381d..712ff28768dc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2665,10 +2665,13 @@ in_pcbinshash(struct inpcb *inp) 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_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2770,6 +2773,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified.