From nobody Tue Nov 17 17:01:49 2026 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 4jTWH16P4lz71Pxs for ; Tue, 17 Nov 2026 17:01:49 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWH15Hfjz3PlY for ; Tue, 17 Nov 2026 17:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934909; 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=ltDActqHxyIO5/C6uk5mkEPjNEt1V+bCmTg2bzbgPd0=; b=DJlJ7Hta0OLVzNgJQPUWmxgcD6UuaNo2M6bmBPVtePaMqATKcosZ0CiLw88Ur47Sy4AwNE e5bFmaJw07Ss2oLDEdl5VOcapvt7w1tXI7oH2jqQ95lQhGzugz6fG/MUUZCwO2gp2o1u84 uGs9m+5rEo8DHCQVegzhrvhasft9jgtPVJel2JWleS/y4YuPwI9sBOZYTIeP5hHax/Y6ad wvEYY8WDcBjO+IbuAISz9+vqVmrkAq5Ye0lZHqFmzkPnKMyr67mXrM2v2D2n/L67CwQjGy K75SMZ5gsT5PCyRTCqdOpgfw0PlomWgb+7pojP8ReGQUOfR+I71VtZIfJTEAmQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934909; b=hUsTko6ngqHHOmBr0adm8YSn6Wjdd/4EZIAUw3t6TRvN50KFb79WgyaegelLxGvGvBnh8y tmGhR/ruc1vYt4SUkiYJAmPYAZIxLWFY/GiEcbxHBqaID0omah/ThfUMHe1Q1bOmvE1uIu 5wckR65tiT358hBMIkV8p6L6cz+gJdmltaI2HGSOQ8Tf51BL5isNrN/TewXG5/m+yYYHk8 id/Gqq5xevVp4lqhORpi/it3FOH2haEKrG4LI4LIWGsPj63A2sZVmfM1Qupq3OkLwaCDSz s6AyjnZYN8KwIjmLXsdjOy+WKy2YgHb8bfvpnI19SP/rWODswNn2n9J2TXZXAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934909; 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=ltDActqHxyIO5/C6uk5mkEPjNEt1V+bCmTg2bzbgPd0=; b=ndKT1Y7dIXAvGfIro/yqjrTnVR72z0i5PK6Pq1isvbr3QAVL25BS8/uECfzWlzmYwqZfDE 2rFU9GPWNpHmRUYuGJdVC+TfXKSGMBFiDlUjI2pap2/tdCTE2u20rGMsnntrVDacsBkR63 r9MJl1rCqHOEddgSQeCq0B/c3IkENYwBrhTSSiZGiH0BPI2AaBu+yItrfP+rwUQ9y9fL2y XiuljgUBVHXXJnDfsX7Dkgl+5THf+io3h5sit+fwRu0C1BI4LcOi0NONhJ8tqmWQJ2KX6W Jh13efNPi6AAU8l9Gt8Q8FCXcuISxTgEXwsHPV0LYfqzkrv9R8SY2MR/P4rDAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWH14y5czr80 for ; Tue, 17 Nov 2026 17:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ced7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6144315d1612 - main - unix: Fix a race between shutdown and listen List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 6144315d1612bc0c3a7ffd22e75aa1fe06dee1ca Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:49 +0000 Message-Id: <6afc887d.1ced7.733cf5d4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6144315d1612bc0c3a7ffd22e75aa1fe06dee1ca commit 6144315d1612bc0c3a7ffd22e75aa1fe06dee1ca Author: Mark Johnston AuthorDate: 2026-11-09 22:27:45 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +0000 unix: Fix a race between shutdown and listen In uipc_shutdown(), the SOLISTENING() check is stale as soon as the socket lock is dropped. Acquire the unpcb lock earlier and use that to interlock with other work that touches the socket buffers which are invalid for a listening socket. Fix unp_dispose() to handle errors when acquiring the I/O lock; contrary to the assertions, such races are possible. Approved by: so Security: FreeBSD-SA-26:83.unix Security: CVE-2026-127751 Reported by: OpenAI Security Research Team Sponsored by: The FreeBSD Foundation --- sys/kern/uipc_usrreq.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index f30119693a76..7d3edd7e32d2 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2730,6 +2730,7 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) struct unpcb *unp = sotounpcb(so); int error; + UNP_PCB_LOCK(unp); SOCK_LOCK(so); if (SOLISTENING(so)) { if (how != SHUT_WR) { @@ -2737,6 +2738,7 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) solisten_wakeup(so); /* unlocks so */ } else SOCK_UNLOCK(so); + UNP_PCB_UNLOCK(unp); return (ENOTCONN); } else if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { @@ -2756,37 +2758,31 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) error = ENOTCONN; if (so->so_type != SOCK_DGRAM) { SOCK_UNLOCK(so); + UNP_PCB_UNLOCK(unp); return (error); } } else error = 0; SOCK_UNLOCK(so); - switch (how) { - case SHUT_RD: - if (so->so_type == SOCK_DGRAM) - socantrcvmore(so); - else - uipc_cantrcvmore(so); - unp_dispose(so); - break; - case SHUT_RDWR: - if (so->so_type == SOCK_DGRAM) - socantrcvmore(so); - else - uipc_cantrcvmore(so); - unp_dispose(so); - /* FALLTHROUGH */ - case SHUT_WR: + if (how == SHUT_WR || how == SHUT_RDWR) { if (so->so_type == SOCK_DGRAM) { socantsendmore(so); } else { - UNP_PCB_LOCK(unp); if (unp->unp_conn != NULL) uipc_cantrcvmore(unp->unp_conn->unp_socket); - UNP_PCB_UNLOCK(unp); } } + if (how == SHUT_RD || how == SHUT_RDWR) { + if (so->so_type == SOCK_DGRAM) + socantrcvmore(so); + else + uipc_cantrcvmore(so); + UNP_PCB_UNLOCK(unp); + unp_dispose(so); + } else { + UNP_PCB_UNLOCK(unp); + } wakeup(&so->so_timeo); return (error); @@ -4559,18 +4555,21 @@ unp_dispose(struct socket *so) struct mbuf *m; int error __diagused; - MPASS(!SOLISTENING(so)); + /* + * Grab our special mbufs before calling sbrelease(). + */ + error = SOCK_IO_RECV_LOCK(so, SBL_WAIT | SBL_NOINTR); + if (error != 0) { + KASSERT(SOLISTENING(so), + ("%s: socket %p is not listening", __func__, so)); + return; + } unp = sotounpcb(so); UNP_LINK_WLOCK(); unp->unp_gcflag |= UNPGC_IGNORE_RIGHTS; UNP_LINK_WUNLOCK(); - /* - * Grab our special mbufs before calling sbrelease(). - */ - error = SOCK_IO_RECV_LOCK(so, SBL_WAIT | SBL_NOINTR); - MPASS(!error); SOCK_RECVBUF_LOCK(so); switch (so->so_type) { case SOCK_DGRAM: