From nobody Tue Nov 17 17:01:54 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 4jTWH74FgLz71Q1R for ; Tue, 17 Nov 2026 17:01:55 +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 4jTWH70D7Yz3PmR for ; Tue, 17 Nov 2026 17:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934915; 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=NFGyDRwXtstkjOVT9uQHbmBWadgq5vX7EPAWUw2P8tU=; b=u1RopbEJygSLKIxCFvEukYd2U0EXkK+QXg5GUgZE5l4x9xPRHCBuxnULOVcu3YgleXL5K9 m5jjjga8Lf2M6pkjs2s4nHDPMybAsYAC1TwfVvKdBOxs6f8d318o8y0eEllbGQHbvgPyGW g7bmUzPI5sY+LFNIuzPG9O2wWYaYwmewfIPGGv79+l437OhNejRhYCFYrjV7oZVkQyzfNM 74rF68qf2OEVI1yH7F+mw3koArgP5NpN+OcGe+LyS85/0bnf5DLlx5NckDvoR+apUIhinx Zv/xIRnqTr/RvwMC8+k4L5Pu2SGKwNSMd1jfu0fH9bqJZjQXiGOMjFPkB/rVpA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934915; b=JkvgP/y7zlHwl2pa6Kkv0ZE2z55vq85o9C4CVnoE8LARcStvrscyjotajv1+0dYMc7wP/u Gq24wkcVY+qIjRcmUTeutPrkQ4Pj/ENtEvQMgbRjxzYQYkKZA4GCjtL5pIos547kDBkARf zmv6cU4J/TmPObxKV4BZ5kK4Plx/s2J3I5sEK83MvMevLohIgNj3GHxc0hqQKL/bFotuJb +CvouVuQRpM/k93C0m+sQpHTFPneu0f5fhJAme+bhePfgWVkrhr3/qYuk0Ub6Q6lZ1X2Nz K+ysNZzqCdUu6oSKQTL1BBcxYXnps8nMZ6Y+SGljkor/+j7bklwyrx11NSg+oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934915; 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=NFGyDRwXtstkjOVT9uQHbmBWadgq5vX7EPAWUw2P8tU=; b=gFGm/3Dx9FpKXnPREQNbylajQcbqfQJLevPmBlQ7rBtHdFWpQGMXoXTj/Mwz5Lz5YGn+1C hETtJQzknJK9rdLKCEFYU7lIFAuikepv39Y7W5EhTWA0O8xQ9w5A6pS0hMzgZ/t2ghxP9v ggAfh+JP5ArtnQNOU4EdCdToNgznBvoc9FRo7dGc1tic03ibExfK0nCPK712W3xmHrlWjt yxel202kYvuczA5z5MHdVyQ8ppuF72pswKadhXKHjl9QXpYZoB4AEWp4mnyWsPTImFsPm1 pvvSG2U9wdMuTwDF0cR0fk1b3xB5SNPC2eLjblcM9WUQimoFNRs+klg+oyvheg== 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 4jTWH66kMXzr5y for ; Tue, 17 Nov 2026 17:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 09d62ba33de1 - main - so_splice: Serialize teardowns of splices 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: 09d62ba33de113d01e889f5f8a5a8db071fba91e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:54 +0000 Message-Id: <6afc8882.1df69.36351708@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09d62ba33de113d01e889f5f8a5a8db071fba91e commit 09d62ba33de113d01e889f5f8a5a8db071fba91e Author: Mark Johnston AuthorDate: 2026-11-12 19:23:32 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +0000 so_splice: Serialize teardowns of splices A socket splice can be configured with a timeout; once the timeout expires, the splice is automatically undone. The implementation of an unsplice operation detaches each socket from the splice structure, and then drains the timeout task. The timeout task takes the splice structure as an argument, and passes the source socket to so_unsplice(). It is possible for two threads to race with the task thread: one removes the source socket from the splice associated with currently running task, and the other thread splices that socket again, creating a new splice structure. The timeout thread may then unsplice the source socket even though it doesn't own that socket's current splice. The resulting use-after-free can be exploited by a local user to escalate privileges. Fix the problem by serializing teardowns of splices: make so_unsplice() callers specify the cause of the teardown, and ensure that threads can't race to destroy a splice after an error occurs. Approved by: so Security: FreeBSD-SA-26:87.socket Security: CVE-2026-127740 Reviewed by: gallatin Reported by: OpenAI Security Research Team Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61443 --- sys/kern/uipc_socket.c | 84 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f4a31fff72c8..86b03a57cd7d 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -375,7 +375,13 @@ static uint32_t splice_index = 0; static void so_splice_timeout(void *arg, int pending); static void so_splice_xfer(struct so_splice *s); -static int so_unsplice(struct socket *so, bool timeout); +enum so_unsplice_reason { + SO_UNSPLICE_SETSOCKOPT, + SO_UNSPLICE_TIMEOUT, + SO_UNSPLICE_EXCEPTION, +}; +static int so_unsplice(struct socket *so, struct so_splice *sp, + enum so_unsplice_reason why); static void splice_work_thread(void *ctx) @@ -695,7 +701,7 @@ closing: sp->state = SPLICE_EXCEPTION; soref(so_src); mtx_unlock(&sp->mtx); - (void)so_unsplice(so_src, false); + (void)so_unsplice(so_src, sp, SO_UNSPLICE_EXCEPTION); sorele(so_src); } else { /* @@ -1691,7 +1697,7 @@ so_splice_timeout(void *arg, int pending __unused) struct so_splice *sp; sp = arg; - (void)so_unsplice(sp->src, true); + (void)so_unsplice(sp->src, sp, SO_UNSPLICE_TIMEOUT); } /* @@ -1764,7 +1770,7 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) sp->dst = NULL; sp->state = SPLICE_EXCEPTION; mtx_unlock(&sp->mtx); - so_unsplice(so, false); + (void)so_unsplice(so, sp, SO_UNSPLICE_EXCEPTION); return (error); } SOCK_SENDBUF_LOCK(so2); @@ -1775,7 +1781,7 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) sp->dst = NULL; sp->state = SPLICE_EXCEPTION; mtx_unlock(&sp->mtx); - so_unsplice(so, false); + (void)so_unsplice(so, sp, SO_UNSPLICE_EXCEPTION); return (EINVAL); } so2->so_snd.sb_flags |= SB_SPLICED; @@ -1801,10 +1807,11 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) } static int -so_unsplice(struct socket *so, bool timeout) +so_unsplice(struct socket *so, struct so_splice *sp, + enum so_unsplice_reason why) { struct socket *so2; - struct so_splice *sp; + int error; bool drain; /* @@ -1823,18 +1830,47 @@ so_unsplice(struct socket *so, bool timeout) SOCK_UNLOCK(so); return (ENOTCONN); } - sp = so->so_splice; + if (sp == NULL) { + sp = so->so_splice; + } else if (sp != so->so_splice) { + SOCK_RECVBUF_UNLOCK(so); + SOCK_UNLOCK(so); + return (EINVAL); + } + error = 0; mtx_lock(&sp->mtx); - if (sp->state == SPLICE_INIT) { + switch (sp->state) { + case SPLICE_INIT: /* * A splice is in the middle of being set up. */ - mtx_unlock(&sp->mtx); + error = ENOTCONN; + break; + case SPLICE_EXCEPTION: + /* + * Make sure that unsplicing is serialized. + */ + if (why != SO_UNSPLICE_EXCEPTION) { + error = ENOTCONN; + break; + } + /* FALLTHROUGH */ + case SPLICE_IDLE: + sp->state = SPLICE_CLOSED; + break; + case SPLICE_QUEUED: + case SPLICE_RUNNING: + sp->state = SPLICE_CLOSING; + break; + default: + __assert_unreachable(); + } + mtx_unlock(&sp->mtx); + if (error != 0) { SOCK_RECVBUF_UNLOCK(so); SOCK_UNLOCK(so); - return (ENOTCONN); + return (error); } - mtx_unlock(&sp->mtx); so->so_rcv.sb_flags &= ~SB_SPLICED; so->so_splice = NULL; SOCK_RECVBUF_UNLOCK(so); @@ -1861,22 +1897,11 @@ so_unsplice(struct socket *so, bool timeout) * finish before proceeding. */ mtx_lock(&sp->mtx); - switch (sp->state) { - case SPLICE_QUEUED: - case SPLICE_RUNNING: - sp->state = SPLICE_CLOSING; - while (sp->state == SPLICE_CLOSING) - msleep(sp, &sp->mtx, PSOCK, "unsplice", 0); - break; - case SPLICE_INIT: - case SPLICE_IDLE: - case SPLICE_EXCEPTION: - sp->state = SPLICE_CLOSED; - break; - default: - __assert_unreachable(); - } - if (!timeout) { + while (sp->state == SPLICE_CLOSING) + msleep(sp, &sp->mtx, PSOCK, "unsplice", 0); + KASSERT(sp->state == SPLICE_CLOSED, + ("%s: splice %p state %d", __func__, sp, sp->state)); + if (why != SO_UNSPLICE_TIMEOUT) { drain = taskqueue_cancel_timeout(taskqueue_thread, &sp->timeout, NULL) != 0; } else { @@ -4093,7 +4118,8 @@ stdopt: error = so_splice(so, so2, &splice); fdrop(fp, sopt->sopt_td); } else { - error = so_unsplice(so, false); + error = so_unsplice(so, NULL, + SO_UNSPLICE_SETSOCKOPT); } break; }