From nobody Tue Nov 17 17:08:18 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 4jTWQW2KGSz71SXH for ; Tue, 17 Nov 2026 17:08:19 +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 4jTWQV72wWz4MsX for ; Tue, 17 Nov 2026 17:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935299; 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=Nh+d45+kBq+TZVRa/DEr2I2V4PUVuaTURA98TnpZI9Y=; b=GpSa84IODZXmtata+xlUf1xgnI50v5zgcECKFFqRfcCCE+lRwDZM9jnh7g54wHIWRxgibv vvZvxHqaw8DIOPf0EtBnKlPUI073xkStanvQnakfICPyyLzBxNkcvpgCKgHdLzgTLnBBcW lNguZBoDI7sveYX/HVkbxul8aUNV9RGXgrfDHAPYXMOzLR6oW2VruPaIbhGfge7NaE39se RgxZK1EgXs3EbqGq1Qsje5bGmjm/FITVX76R7LH7SdaM86v7DRtPBiR4EiaCslYnZcDMSi N8mlRvBFU25qkIytdQ4RESuqTR/YklONB1zfM6Oe79fLuyBZpAhr7Ysw8lFzfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935299; b=ANteUfFPAEGqR58N77i4Oe51SzbkyqQfLISi0Y339Ht2qzFBLnyYkTVOHGmfPjLvH1IHyQ flRXXWxp2uoNVz/TSOzdMupyLTEG6lzfw2MhVrLE9zm2h+aN4bp6t6cnZn855Jf3B7rzkA kG9pWaBAzkhS5WgsYvn5FNPIi1WMZ3BvsfLVh4Rb28rZHN4Qg32S2hJZBAxHpTW4bBckvz wpQQyJ1nbWucA8B+/kIvCInP+FP7VuC2M0KJtRPrgeCLgNfPyO8t1N8BOkNHufX2nbfams J8watqM5qyZM4bZdL6KIQgb+GH1Pf4K4Odz7E6533X2KkRscvIEUVvCe8W/E0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935299; 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=Nh+d45+kBq+TZVRa/DEr2I2V4PUVuaTURA98TnpZI9Y=; b=XuFCKq+t/UaglB05wRC9feQPQ5zvHDaIpG4vWbqU09c0ZHUnaus7D0MmAEcW+o73oTDObz q/dXQOut4jrw1+vQSuJacIadxbc8LxaP2kuhvVeKLNTwBtcvCBrorSVVJfFMY4zyxrVTUz PBK0UsxX/8w8zutC5LScjicLTtBRVBht5hEUtmCc5By7zrZXjRU9YKdfaPojbKNNBWzJUs 83R1m9QirgE3P0rdG4JwH+VG0GMuhLDjgK4abKKI0E3otrIf5DKTFgsrBkkeidpblwHoyV hJMCdamTZvECYJNS8v0dK98Sy7MRbdOo8NFCNLuHbLgWlMjA9p5lRwhLm+eCBw== 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 4jTWQV6cYCzrq6 for ; Tue, 17 Nov 2026 17:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3a847375eb72 - releng/15.1 - 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3a847375eb723900ab33426028d5428b6abda55e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:18 +0000 Message-Id: <6afc8a02.d37.7b6dd792@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a847375eb723900ab33426028d5428b6abda55e commit 3a847375eb723900ab33426028d5428b6abda55e Author: Mark Johnston AuthorDate: 2026-11-09 22:27:45 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:21:09 +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 ccc02c98e3ac..35e055affd53 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2677,6 +2677,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) { @@ -2684,6 +2685,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) { @@ -2703,37 +2705,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); @@ -4307,18 +4303,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: