From nobody Thu May 07 20:40:23 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 4gBPJm1m2xz6bvb0 for ; Thu, 07 May 2026 20:40:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBPJm00f9z3Np4 for ; Thu, 07 May 2026 20:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186424; 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=DThAdjnFMwqMWzTUoRJ5MIjTexvKDh96f+32UYlP4QY=; b=Vpq0BGIBjUdF1rdXVHiqpgd9eAnpFeSjN9d4dTcb1zKEzsK7gH7FGGda1/B0RBWCeIsXOv NDDO8u8iAeIzFj4UeQCbKlBAJo/G8+x6jFvecZ84wlsUwyF9wk80Hp0Eu/B4U0a87G3K1x jWjeHj+OLaSmBdBOhllktLfPUxqcmw4oYFubjnkSoGxR0/IbpSFZgQcYNzYzS2Q4DhL2/k RrComFUDkA89PEz3k6/9p22jl6pLUbYP0Jiei20ulyMewCV8OI+sAG902ESs2HyjUbJvZ7 CW6GwHsol3hecmSLDm+R5LvYYQJQFSvvFmNw6hwHMrg+5OOY2eAsFMDO9WtxSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186424; a=rsa-sha256; cv=none; b=Ds1GtD2FaHD/kzKeghPv1wZ+osTqPngMfIoS9wCw7Lm/EgfZzpMa1ncpYK8rEhYw5rO2GR njzg2j9GeFuqO8KVZRJj4vIy0EPAs94By3+G11qS3gtV4a2CaIJSQV9giz8dfn60/Se9Sq zHdsn7Th7IKXvWl2VSq6raOYhxYrcitixp+Krwt9wzpltE0/QFaxVfOD6Feq2KiXOEQXUU JnUY9KMgQh+1GuCaieeBuwQ9tBtUrlb0f7Phrl+Y/0OmTePqfmuXouCWYKdqPmubbepYBt +vPogJvcNCLF9Agw7/dAZgv5KF2Xb3IvtOFfruPQ96NXlia03oj29UZep8211w== 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=1778186424; 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=DThAdjnFMwqMWzTUoRJ5MIjTexvKDh96f+32UYlP4QY=; b=GoskHBuS8/iVBRW13YDTQEnt4FKNaAb+mpdIqTs2oNI1RlIXyxUYCdIqEzheseY5QhtC+Z 1mBIipJ4yzb+bw88IaVDmSdqKgHa9Q/Lw+7r4jtOZ0szwt5deEcXkLc9JoI8A5wp6jTHXW MOq8fGSIji2qEuYOtVPtZdaZpMq/Wz0X8zT+ufngcUtax2sD4+FXaLI5MmFp4A4mDqnque mu68g1LvGTd1yfl2hU0Ms8sgTMvEQQmCHvFBBh5hpKsv+Uj3VLUZNJ8FtwSUStyZ8p1lrW habDrK6wJRJc5CJEpav4ZqqE5q24xWT1u9LI0WY9pzKDYQBG8RXKe0raAW1KJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJl6g68zjWc for ; Thu, 07 May 2026 20:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22222 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: a096a97448cf - releng/15.1 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a096a97448cfc7e593bcf8873c0f0d3b94f219f1 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:23 +0000 Message-Id: <69fcf8b7.22222.492f7340@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a096a97448cfc7e593bcf8873c0f0d3b94f219f1 commit a096a97448cfc7e593bcf8873c0f0d3b94f219f1 Author: Mark Johnston AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:40:02 +0000 so_splice: Fix the KTLS check for the sink socket in so_splice() Approved by: re (cperciva) 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) (cherry picked from commit 43b1de5970d1246aa54d8e34b0f211511cc2b103) --- 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 358393a3bf9a..d2ad4e147da5 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1736,7 +1736,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); mtx_lock(&sp->mtx);