From nobody Tue Nov 17 17:08:25 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 4jTWQf0k64z71SRc for ; Tue, 17 Nov 2026 17:08:26 +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 4jTWQd228Lz4MtQ for ; Tue, 17 Nov 2026 17:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935305; 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=JvCDIhFl6nD7tKE1G6m1gZBh2RYBmUMWHp5ur+/x8ik=; b=Rs3X9MQTg+o1Eedfvb2qmMTvrkD53b8GwAUJ6SLwxBq6A9co825Tbp8yNRApxG8WRbyCH1 botlKiq0AEw+smAiUKjaCYFVJo3QEA8fO8OsMQ1jxfuRj2dWuayERoMz8KZmtLtoWCaAhO qCLIC23whtfXu7bAUlnXHgNp9+Sj8ScbxOouqsFFmSMkCmmSlcZDMs4aFWt7lE2c4D/y1A mfKxCEnBozTZZJzaOJfnkVHywfjosm7mNozCM+4ihJkojf9v4Dldu2iLy9ceFKlPW/DPv6 33/WrVmMpVxckSQQGV4qcF2T5q7+K3NnSvnF7awtJzIXZ6zSy2pSgzPmoicQpQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935305; b=KnLSfHslhXM4RNhBujLDpb5mV/qHPUISdhElRHV4zyASrEV0S5/TeY4h/4VlCdOtG/t46R wbPDSlmaMi8/N+xkSl09IPC+BPwKBxOwiftTIu563mQukizsux7zhPYHi6lalLDlCgme/3 vVUcz8kzdp2X5ljI3wfzud0u2IY8/FPf8YboPVynYbG+5aPVYPn2yBa7vEGGk/wctI4tsC VROQdzDa3LNscTS9n7NnXUYjcDb3O9IIeknunp/EIpm5MuYXkuJ2IaeA2qCqLp6J4hg2fr OUIIG2DcM+RcWWXIxtdSYsiQDMJdz2/0fbswXF1sImq3/2ymzgf94JefyYc1eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935305; 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=JvCDIhFl6nD7tKE1G6m1gZBh2RYBmUMWHp5ur+/x8ik=; b=dmQuDP1FJpLgdc/i6vGONVO0JqpI1XJk6NPRslk2Y/S+q788/lw0v1t2H1LlADYAXlTdPc cHUmev7Tpsu4yx0myeiNxZnnHGSZdcu0UyhpGrK18xrfpZ4gWdqFlVeURojHM6ha0Kl0Ca ulzzdQ10UO8kgapq09H2EZTWsEDZlwuxCr8PqXFCIF/XkFb7O3Mgxm6Ou9WOEtrbKDDvfD kdigtAIhAwvt0dG9jwCKAeWjY1rXX6frZTK5VWw5cAvsJsgfD0C2dvOkTnNKOLNL5DANIY +IIHtyTNYgvvsEK1vZXY6fsGJ7wClNwoTvfn6HeKMlGeg9BtDcQAr80yH1o8eg== 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 4jTWQd1hNrzry0 for ; Tue, 17 Nov 2026 17:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: de7f7d5ea959 - releng/15.1 - 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: de7f7d5ea9595bfc504fc491c898cd5ca4b6c429 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:25 +0000 Message-Id: <6afc8a09.4a0.bb0c7c@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de7f7d5ea9595bfc504fc491c898cd5ca4b6c429 commit de7f7d5ea9595bfc504fc491c898cd5ca4b6c429 Author: Mark Johnston AuthorDate: 2026-11-12 19:23:32 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:25:03 +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 d31d91d9ef91..c6f27f9a8f0f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -348,7 +348,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) @@ -656,7 +662,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 { /* @@ -1659,7 +1665,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); } /* @@ -1732,7 +1738,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); @@ -1743,7 +1749,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; @@ -1769,10 +1775,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; /* @@ -1791,18 +1798,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); @@ -1829,22 +1865,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 { @@ -4028,7 +4053,8 @@ sosetopt(struct socket *so, struct sockopt *sopt) 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; }