From nobody Wed Oct 22 15:48:51 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 4csD9H4wP0z6Clsw; Wed, 22 Oct 2025 15:48: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 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 4csD9H4F30z3Q3N; Wed, 22 Oct 2025 15:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148131; 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=ESWHPGti5hrGUyHJegxggkZu89qJViHg286e+0eC2PU=; b=Q1OJqTUQiGhmmAn305VIH3mkfjqoqjHW5GJdx0o6LhcHu+SYJ+/dXfPT6OTe62OaErHusV A6D5ZuxvDoWarCBiUNQXBRDb3sRxupjHRGuDmiCRFZvs31Lh3N+LQkxTUoeNQCpvUEyS7E KJcU+K7axW0v0tOcQT6lHyTIwxOoLs7KqUMHyzU4YKAWL+6ZEuTRGAo3YS3a5mIxUo702t 0VR7Hr8hRpk6QCug0pczmg7saTm0d6zQOHzYklfNCCa+deiSAurxw5fmR9zQoJFz1/yuZS rdZtLoG+zh212hTwE3o/Elt7N+JBwbWFT/vvUUgrltUmVQ4CKPzpqOCmoHstLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148131; 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=ESWHPGti5hrGUyHJegxggkZu89qJViHg286e+0eC2PU=; b=baANrjX13QcnwaOLPylznu6E+4HSN+jIH0x884l584baIHVg7zrLWYPz7B6mDjn/qyKDU2 pD0rydVfBT/679yO8NKdCcZ56eMuz6NDTnWJL0PC7tlPQ9Hur9GxDR9JCUsuFcUMn4WB8H nwslgVD2rOgei94yL2Z1pKD6TpFfhXJbtDjn7txYY6LEzIV29ty90EvZsUI/FgnoO+O8yC zn20BTjSoqUB3sSdjji1vhimXKnNSKsVT8zWg+MCnG/uN2+5C69QgGSCovGRjDl3+c17J/ adxhDws6mski+W5exY/J24tfUldBtVCqzgCOrOyfkBay8MPPu16jHsXquuhaTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148131; a=rsa-sha256; cv=none; b=xhtYk+bXsJZf1QRS/ryz1Otj8fIkXlti0lh4m+xryDNvXBcOyvzERFKc1TluVTKEwZU0I+ XHPJMD5hRFF+n9oEl/JbVbWY8lWRh1WRVQp3BcpPZyrdBPCwXHAO1fx9fTo+BWBjmJPrdl c7o3peBAoTjOLScSKgIHBQxRxbdAs4t4KN1MxvQMLlZDTgr4gRW2dnWxy8nalZTz2eohDl tGI16voEL6hld/hvhrX5DBzulxmXYSVQ1NYGm01hM+dzR5uBTVVd3PDaM0pVpxvy638K4m Hr1oJczB7rNgWXuZ40EsXaQzR6PcjQwIFUyIXoMGK9y1Vb1IW7mSwBe17NET5g== 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 4csD9H3Zy9zbll; Wed, 22 Oct 2025 15:48:51 +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 59MFmpuQ022456; Wed, 22 Oct 2025 15:48:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFmp7a022453; Wed, 22 Oct 2025 15:48:51 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:48:51 GMT Message-Id: <202510221548.59MFmp7a022453@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: e276759b3687 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e276759b368701a49e543c45d5d6ea08ed4fbc38 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e276759b368701a49e543c45d5d6ea08ed4fbc38 commit e276759b368701a49e543c45d5d6ea08ed4fbc38 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:48:32 +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 89000a521bff..7d665c7d2a73 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2702,10 +2702,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); @@ -2836,6 +2839,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.