From nobody Tue Jul 14 14:56: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 4h02SJ114Rz6kqw5 for ; Tue, 14 Jul 2026 14:56: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h02SH3M4Nz3Lp4 for ; Tue, 14 Jul 2026 14:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784040975; 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=oJVopJYT4iNE+pwwBFmKbDBV9UP4GXKYaWtztX2WwfQ=; b=GAir2OWc7adpGcBhEa4tpIe+cdbx1UReD5F7lej+1BKyWYm3NyPCHvAvBEpCCiMgH/rriB Ae1ryXNgOgPggFs7uxNGlWeOUpy+0akkvhIS/DfxhM5Brf7+f3zG5KqVqbduJrnTHLetji YVgGamrMAjN6GzajEThRMpKnV58RRg8aeCnWEFN55HNafWFLCGl4gLDqQ4t8RiBJFvfHGH Cxu/bLtq3WRByEbAzAbt4IkhCDx6E5o1aBg+Dgo4jEFxBx0OFgL+GM+N4LbvjUV2JZaaIP SUeeWnElGOvDD7G5g2721uUVQ7U+3IXn/2889lqVvAK8mUVo+qJSPJDh3a9x8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784040975; a=rsa-sha256; cv=none; b=Mq2zLRblXn/qDPaQeRCM/5/eSNH0JL/oGaVnJLNRcTLdysf/zV5ToLpSsG+OaxLDni4eb8 0ksH7pMPUunuonocNVpoU+psP23y+cfpcli13lxfyGNooH9/3cberJ9bI0S8RI3b6Ys95I Ov9tcxYuLAdwlqxzBgtqV2nsLxYD3FA019eiEC+9pjvnchUAGV78DBoAozPr+ulEHn8wCZ pgSp2KANFRGuel/pLAgDHM5JrdYeoBjsvA2Mu48om/JuqoJyTBvAIAplZXRCp3yIzX9pH8 hF/O1k85+vxs7DvPcGvqKbprfJgEMiie7YaiiWpiYFqMSVq9rJJOPcD7Mu6ezA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784040975; 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=oJVopJYT4iNE+pwwBFmKbDBV9UP4GXKYaWtztX2WwfQ=; b=p1m6xilidnjKfzVp7DmRv2nNTGVJdcVTTPY4h64Qg0iJzNCGcwm5CokSyi/f31ess3hG3F 5nAOc2Wdkb0bLvcXHPvUy66xyu/IxK2jWIuc4nRXZWCa+5BY9s/YNVPSUGwcRsNJtGUOru g+KyUg3LzL0TtGwIhEknhKOLI8s5lntQkaZeaAHmnCYXjTuHF/Vf4NIQr3luMFxUTUgYCd dJZTiBDeJCtyz4Z9JVEYhQ4e4SPVqWzAMW/iN2c1M453CYkcdh7TPQHq5WA2o9vQlkC68O nsQY+zkuiyJBH/QHYGZw/BR0P0S8Xsmm6J/53aCuqjithM4Ytr2gmn4x1uAV0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h02SH1yGmzq1q for ; Tue, 14 Jul 2026 14:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 14:56:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 60585ee63af6 - stable/14 - so_splice: Fix the KTLS check for the sink socket in so_splice() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 60585ee63af6c738bdcc0261da57192a547bfbf6 Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 14:56:15 +0000 Message-Id: <6a564e0f.3e1ba.53a21d51@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60585ee63af6c738bdcc0261da57192a547bfbf6 commit 60585ee63af6c738bdcc0261da57192a547bfbf6 Author: Mark Johnston AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Mark Johnston CommitDate: 2026-07-14 14:08:40 +0000 so_splice: Fix the KTLS check for the sink socket in so_splice() Reviewed by: gallatin Reported by: Claude Sonnet 4.6 Fixes: 1000cc4a0d39 ("so_splice: Disallow splicing with KTLS-enabled sockets") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56385 (cherry picked from commit d88a159da42a75dbd46ea4f6f9c8059975dab5e8) --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 2e7bf0b5e5fa..515f038b78fa 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1707,7 +1707,7 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) return (error); } SOCK_SENDBUF_LOCK(so2); - if (so->so_snd.sb_tls_info != NULL) { + if (so2->so_snd.sb_tls_info != NULL) { SOCK_SENDBUF_UNLOCK(so2); SOCK_UNLOCK(so2); so_unsplice(so, false);