From nobody Tue Nov 17 17:06:02 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 4jTWMv07z8z71S08 for ; Tue, 17 Nov 2026 17:06:03 +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 4jTWMt5XP2z4JL6 for ; Tue, 17 Nov 2026 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935162; 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=5m0j4LYZNy7owrEoVPsnBId6Su98NEkTGF8CFIeKFBA=; b=jfmsVMvBZVlcbqe3MqEgNEeW/e/bL5ifU6hM1AlQSR6J7qmWt3l/hgaDSks97Um5pDiw0i c6SLcVYO0H3hY+gMxbSfK29DQY3kFCCU0qpB7MIhsZcOQtC/n6SuphqZ6e/MY58zjLmg9P a6698J2CjJMmO7kkshS9e5sytdaCULI3U0AN37gO6oDd9DplKWze4rSNOQjV4IuZzphHJD fTD5Z4l8eUTozeP6qMCnscbER0kpfaCRKgD7slg3c8r2nn99PNmzXoa4pn0uKhwgbH1Qep gbQy+bcR07IQ42GLfg0Qkz53N3ShMDu5Bo/E+RamkBr+9LLLbNKqXKzpdm8AEQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935162; b=Z7CTjjI+zxFabnDSnZc1yEcbNi7fnWVEOOrKmPs28Ex27xtnqbk7RDp4xwCnRjA/s8ozWm c6Fu0hVY+QDy/n1Xb64R+R6WU4A0FKcOG74JY8ju2387F7tXwyXtdsPrlftkgyri4rx3ll BVB9xL+bfhHPs9+Ubsy37pzg5hy8cVa1+k4mPWMV1UE6dB1vJ7fpXTn9A1FAtPpDt1TV41 3wvkJh22lsvK3EAwjJV1jHBuhP6AwnvHgpEQXrcWn9zTJ2big7yY+a4CzBko5d1kSzYRtz OQeMFgNgPNNFGM2v1bygqL/+h7y0pTw6/GNJtAKmf+w0ybbIVhSXjy+btqg7Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935162; 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=5m0j4LYZNy7owrEoVPsnBId6Su98NEkTGF8CFIeKFBA=; b=mbMw6T82raT6cK8GYtAbv0+lIyj6gFYNqNAJ9D6Y4o1I/ucgWJfzuPPD9635Uhhsi53e6j J/4+8GWxg3yRcmq6rGpxNj55OB5UIqa0Q21NvIHwDIGqv3Wh7ebfa0lCso/R92Xq6RtdJq ypZmquXAQt0TU0WcTICBOk3spJQ8371X8IFVG4gXqbvauODudAFGPcIbwWZn5sBilYDyle 9PVMZJcZ0YCYNC83Xl2iXaalJWRV/TsPJKw+8l5fUgRMeudO0rMsAYj7YO3tLdHxyTHkLS 2aJVgAcns892xjVqlPlLJ0AepY0AVJVZ7q/Z+ke1u9GMfDeP1/QmBflciASQzQ== 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 4jTWMt4nVmzrSd for ; Tue, 17 Nov 2026 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f564 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 645a017e1c93 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 645a017e1c93cd62690cb0e9062f46653f0602c9 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:02 +0000 Message-Id: <6afc897a.1f564.17bb4636@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=645a017e1c93cd62690cb0e9062f46653f0602c9 commit 645a017e1c93cd62690cb0e9062f46653f0602c9 Author: Mark Johnston AuthorDate: 2026-11-09 22:27:45 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:22 +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 6bafb33b5948..a5493a9ef6ef 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2659,6 +2659,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) { @@ -2666,6 +2667,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) { @@ -2685,37 +2687,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); @@ -4290,18 +4286,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: