From nobody Wed Oct 22 15:50:30 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 4csDCB4DLWz6Cm2j; Wed, 22 Oct 2025 15:50:30 +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 4csDCB3cscz3RWs; Wed, 22 Oct 2025 15:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148230; 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=OXGfezyHMyg+YomCkiVHE+OZhTL9Zh2+0zNms3O8nlE=; b=Im1HWDqFYMOSzPGIIHFA3nnhf9djPdG/FFvZG/oEgaei1XIFtBdEKFCNrqJBbCT3blS2eo umZzvM8Cso2IgZAiKss6hDLBL0Bu9PQv3nFcJXwL53mK5fHOMcOouVzvSb1ttx/K3pPnkQ rniZ1+yVFsq96O6o4y062EcB4f8Xr6Xw8++rd25LSqqGFxLkgd/weur6v155CnKT6bxhxD SMHqVNu5OzhvRzX+g/NxGxiHQvhcD0qLAjXnTzk9oZhVtLLXJqWZk6Th2HQfZaHLZ4nNzg pqKWhFZDbZrf4PBw4n66JB5sQRnln1pyAGfL+Y3QODuFnOH8UCwsT/FYNW93Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148230; 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=OXGfezyHMyg+YomCkiVHE+OZhTL9Zh2+0zNms3O8nlE=; b=X68fuUTXCNNQt7CVbgTRh3CKh/eL75qJi2d304DN7CrPr2au5zC8+MXOu1m0XwdRAN+5yH o0Wv/crb2GPKbHqGJE48BF6N7s/rpxCCwl0npJVLOK6TYcDeY0/FEyaoZn1jYZsZoQbFDM Fxx+UraeNJJsDy1adonKZIzE/rFCaf5AAVgGlWyPVdLarJT5tOhj2LHNRkYJtOBJ3KRiuq M/zfBDk7+4HrtZSCHz3M3TCxW5A8xh8jDiUBHmSJ3MJi7nJRfJXXYMk+3Ef7kaSZfmjSwm dfTf6WLYW7N6mriJrKUECu+Lb/BbhJ0X61deSI/Q2pkNDM8uXJ2Ngn69NnYKDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148230; a=rsa-sha256; cv=none; b=sq3zXCGSALuchcez4usZNeB4DPVqOSy5ZBGdkm0bt5azGF+juKqUa1aJtaXw/ZJRB5z1Az I/YSALXl/mXu/HIgrAt7cTmJBmfDpt6dIHzYTS4nHSyBhwdGZ2s9J79WdBCrwz1r694MrO Rd6D4tT08kZIaWNUh64HjbW+W1MRuY0c330nbbr99QkLixpXLEoEJkKuLHoV3I74d5nCcz PpJ1cNLug5kNsvizleJYYxY+J7nED4iA8DbmochnX3UFxKUOcyks8ZCc7wk2jFcFN9otqC wxAAToELwhDhhn9kyktiJd6/q0uHcVlS/OXKFoLbu+nFx8p6QnIhika4Ue7O/g== 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 4csDCB3DMRzbnM; Wed, 22 Oct 2025 15:50:30 +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 59MFoUFo031952; Wed, 22 Oct 2025 15:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFoUjD031949; Wed, 22 Oct 2025 15:50:30 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:50:30 GMT Message-Id: <202510221550.59MFoUjD031949@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: 98c539667881 - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: 98c539667881d7a3291261fdc754b30820731234 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98c539667881d7a3291261fdc754b30820731234 commit 98c539667881d7a3291261fdc754b30820731234 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:49:44 +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 Approved by: re (cperciva) Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 (cherry picked from commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53) (cherry picked from commit ef159100ec2b73c22caccc00555bae4c3cbc0ea1) --- 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.