From nobody Tue Nov 17 17:05:15 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 4jTWM00csjz71Rjf for ; Tue, 17 Nov 2026 17:05:16 +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 4jTWLz1LzQz4GvF for ; Tue, 17 Nov 2026 17:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfXGdB6jDSt3vZuGtRKZ/VJjTi+yUfnowR+TbNjrSZ0=; b=pvgMARnwezja5pbPPjy3/bdPEzxUfYn1wNCJgW7PuJhPtEbzkYJDIKH0SdCV+Ub+hvOjQa w/Mo+CEIiFx2SahSHbcXQvBNe1RbW6HwlQ2bLcgR8vfwhv9LroHtTEVdpohB5wRyZ4arqq rn6xwOVcQW50nLsSHj5c2CB7drItwThT90YGConi6u9H53JL4W1OiP6+WJD3NvfVpHMf8n r/1I8GD/0Lir05ROUeNC4q85zolYdLegsv0NtZp/WP+2mljn+GwN7zmcgwh/16j6XGd6u7 +sL+h2lb6Mpf9UcTngpq3py3LHLUpYgFUFNbj7fSKji39YuMv1k2ufdsGNnn6g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935115; b=kinO1d78z7UUHio/7QXJfmGTlp8+CqIOeHD6KPb/nkniPOz+8lIs0+c+Gls+nmFyUwvwEu G7G51EU2ffaVEROX8YarFVehhQ7hXEWRj8c9pQ0O3H+5rPbLpLqeAhiCsblJtRG9xWvSZB 0rc58OnBp+L5ynV67OM+vUCTWQYNAZRgt46bT3fkRmD9cGlvqwcxobiDoyLER7DrhC/maA Z9YAwGB7VnP3A2YzlAprxejJWgvY60kLakGqALeCu7UUJUHY/9CkUXcbuizcrRm+gmpcTH wSsJtaziqSn4dGucOcqWG7fa02J+M5o2/f+Il2pjt4XiBYWts/4Q0OOAgHH9Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfXGdB6jDSt3vZuGtRKZ/VJjTi+yUfnowR+TbNjrSZ0=; b=WhZ62Fqgs8hwyEyJjtw4Dz8xPY9t41t1zw4IT861qclZOppy/ZuAXibzP8dJrd2ERZM52Q hPy+0auLg3IWk6q8SmSOhSv0C9v+8a1JRMTAKlOkAh0Oes+Fv4JDJtfoG3AVkbY3Z++tVR l3407nNK12maVcLcEZNgCM5RQpW4RfiENnkCMMVqg2pS/Hk/7OzZ6M/BBjI6LUego5zuSH YSvik5N9EMmyQ722NEILrU97GEa/EOD2uQnYiVeibPVG7Bn687BIL2hsM066GO28IJKSU6 /e3FKkBldhXG7F9fNf2HYIcw6KbhnwXcujRsuhKLc1wTvD4W3M27hXjeTIEvkg== 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 4jTWLz11WHzrVd for ; Tue, 17 Nov 2026 17:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Mark Johnston Subject: git: 0c7ed31b613d - releng/14.5 - splice: Fix leaks that can happen when initiating a splice 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/14.5 X-Git-Reftype: branch X-Git-Commit: 0c7ed31b613d3491c32419853b2f61d9dac03d88 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:15 +0000 Message-Id: <6afc894b.1f6f7.58535da0@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c7ed31b613d3491c32419853b2f61d9dac03d88 commit 0c7ed31b613d3491c32419853b2f61d9dac03d88 Author: Andrew Gallatin AuthorDate: 2025-12-09 21:06:20 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:17:12 +0000 splice: Fix leaks that can happen when initiating a splice - change the state to SPLICE_EXCEPTION to allow so_unsplice() to work to cleanup failed splices (fixes socket reference leak) - NULL out sp->dst when unsplicing from so_splice() before so2 has been been referenced. - Deal with a null sp->dst / so2 in so_unsplice - Fix asserts that talked about sp->state == SPLICE_INIT; that state is not possible here. Approved by: so Security: FreeBSD-SA-26:87.socket Differential Revision: https://reviews.freebsd.org/D54157 Reviewed by: markj Sponsored by: Netflix Fixes: c0c5d01e5374 ("so_splice: Synchronize so_unsplice() with so_splice()") MFC after: 3 days (cherry picked from commit a837d1fe49e0255d81c670dc271ff245ae960097) --- sys/kern/uipc_socket.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 2c7467e6f4db..7811e33ad46c 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1707,6 +1707,10 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) error = EBUSY; if (error != 0) { SOCK_UNLOCK(so2); + mtx_lock(&sp->mtx); + sp->dst = NULL; + sp->state = SPLICE_EXCEPTION; + mtx_unlock(&sp->mtx); so_unsplice(so, false); return (error); } @@ -1714,6 +1718,10 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) if (so2->so_snd.sb_tls_info != NULL) { SOCK_SENDBUF_UNLOCK(so2); SOCK_UNLOCK(so2); + mtx_lock(&sp->mtx); + sp->dst = NULL; + sp->state = SPLICE_EXCEPTION; + mtx_unlock(&sp->mtx); so_unsplice(so, false); return (EINVAL); } @@ -1780,20 +1788,20 @@ so_unsplice(struct socket *so, bool timeout) SOCK_UNLOCK(so); so2 = sp->dst; - SOCK_LOCK(so2); - KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__)); - SOCK_SENDBUF_LOCK(so2); - KASSERT(sp->state == SPLICE_INIT || - (so2->so_snd.sb_flags & SB_SPLICED) != 0, - ("%s: so2 is not spliced", __func__)); - KASSERT(sp->state == SPLICE_INIT || - so2->so_splice_back == sp, - ("%s: so_splice_back != sp", __func__)); - so2->so_snd.sb_flags &= ~SB_SPLICED; - so2rele = so2->so_splice_back != NULL; - so2->so_splice_back = NULL; - SOCK_SENDBUF_UNLOCK(so2); - SOCK_UNLOCK(so2); + if (so2 != NULL) { + SOCK_LOCK(so2); + KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__)); + SOCK_SENDBUF_LOCK(so2); + KASSERT((so2->so_snd.sb_flags & SB_SPLICED) != 0, + ("%s: so2 is not spliced", __func__)); + KASSERT(so2->so_splice_back == sp, + ("%s: so_splice_back != sp", __func__)); + so2->so_snd.sb_flags &= ~SB_SPLICED; + so2rele = so2->so_splice_back != NULL; + so2->so_splice_back = NULL; + SOCK_SENDBUF_UNLOCK(so2); + SOCK_UNLOCK(so2); + } /* * No new work is being enqueued. The worker thread might be @@ -1833,9 +1841,11 @@ so_unsplice(struct socket *so, bool timeout) sorwakeup(so); CURVNET_SET(so->so_vnet); sorele(so); - sowwakeup(so2); - if (so2rele) - sorele(so2); + if (so2 != NULL) { + sowwakeup(so2); + if (so2rele) + sorele(so2); + } CURVNET_RESTORE(); so_splice_free(sp); return (0);