From nobody Tue Nov 17 17:09:43 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 4jTWS83lH8z71Ssb for ; Tue, 17 Nov 2026 17:09:44 +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 4jTWS75xhNz4Q8g for ; Tue, 17 Nov 2026 17:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935383; 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=X8lAye4FI6ByHpkoJia4b6nF4yjeXXKgTIdWew1D8w0=; b=r1W6BmyzXL+C8/Sn4+l3+lm2McrrJU4KbwPDkTZ3Y7EVJTIAhhngxc7zua5Do1GtnsM7dz Ugde4hR1IAHITxhKDPTmLWgx2+DW2RnlkUMBnJS7jMy5cWiS6h8TLJTnSROTUTaw+494ai 9G2quDaunW6vMNHKh6rwC2b2el3bV/U/YRdGqSAxAPBXlmrDLJe/G7C1jGrzFGZUn/Iagl uTS7Fd+/YXAvW7R/dzqFua2R4EPS3aVuUh0IRvhRN2e/11wJhnTdGi5pm1xBsFLJa+3mCV HhbQxNFqPZkNHQpkP1RffgiW9MV5IqFK4XbVKUlz88T5rkHziLPyVY5yaa0mbA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935383; b=TLvSy3VE6RMfvoKphpwTu+oJPhUVUKNWbYjXyf56e1fo8hfAyIqTcRS0g6nMGyQaO7zA25 eVvxp1iTfeI9rCL4htrBy6CAH4SRP/rZTbZ9GF/TnCg1YPXN+xZKVsCP6p5LjYnKYhUB4F mNqJX6M8FuUidr9hp/+KOUtX+WZ3iAhoJ+ACx272RyXs1EeoPiPYPi+M6Mm7+IdwoFT2AP zNCo3ME6uy6Yvq1U8hMPAMhCceMGuajUj3HIRNc9g7KQIMsuHelzJdRjKphi0f6JSjxBOt twjD44PExPtHlRHkNCyyJGnjrt0iKoM+iCVW/TzEA0bRDS/TB1KeT+BjyCNPIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935383; 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=X8lAye4FI6ByHpkoJia4b6nF4yjeXXKgTIdWew1D8w0=; b=IqeAin7Tq7w9kxq89pgXD/c4DAWye4ryxtCoNoAhpNsx1wEJuopmm4J8v+KXq8YIP5kd2y KJRDB967dtQkAIz0p5YmbZ+kSOv2LY/a9Oqry+T0ouZAA+6ixLoFz42gvszKXQtsIf2OvQ wO6ZnB9NHV3ZE5aoOi+8ijLdb1mZ/TdsULsP0SSN6hOkTudCYcanCH/QpRvV+W402P/Bjr upf8MlKcVPcBZTp5UkB+vUm87ocQb466xup0RrBdUE+2P70W0ZNJ6WnjfUGxOGStiMZ679 DrAAvDthVyzwlyeu22ke5F3FAdZtWY+/LfbRMjAGW9v0Dmf2ocoRyjpKqhek7A== 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 4jTWS75Bvgzrnk for ; Tue, 17 Nov 2026 17:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bd596508db77 - releng/15.2 - 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.2 X-Git-Reftype: branch X-Git-Commit: bd596508db779e166055a26fc2ff949e759f7f21 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:43 +0000 Message-Id: <6afc8a57.c25.618e104e@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bd596508db779e166055a26fc2ff949e759f7f21 commit bd596508db779e166055a26fc2ff949e759f7f21 Author: Mark Johnston AuthorDate: 2026-11-09 22:27:45 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:35:24 +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: re (cperciva) 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: