From nobody Sun May 3 15:45:40 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 4g7pyY0xXlz6W38X for ; Sun, 03 May 2026 15:45:41 +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 4g7pyX4jH9z3J95 for ; Sun, 03 May 2026 15:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777823140; 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=0DYlXuAaYtmj+UBFBSAyEU0UtRIaEX1aV32NFAU/DBU=; b=DmUl8RPvaisEWkSRQ5bgth3xQg6Dl3bjM5uIyj+XhS6QYAZISUi3v109aryiAEQJH60+r3 cwoqhnCAicoJx3SJYdabnPnJzF2f+EXvoNbvzzPku3wwOADaTzTC15GtfUJM13NTKpoWJm zGZdmF8LsoU8MOK1nkGU/qH/U1CoL3S1WkmeAW96oC5zGTK2z8ovNigdOTZf9N3mtCKv0c 2tMhpCPKUL5/Z+HWfABb5zyys1BveYGlerRQNup0tGIri2YQ+Gb9Hnh+Gnxg7n2XBtEeCe 9flZEbMCpZWq7vTlifFLDm4gjkYuLZ2WFdOFEkMkCxSg88XUwpFbAZW6GPHIFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777823140; a=rsa-sha256; cv=none; b=kIhgkCwgN6pGVoL3JG528sQrbDHfCj6Fs8MqtyyQstuK05iHG5+VUH6ftj/6BowdOH9bqx AsNrt0kAzVjsBIIQPPthpMkPrGfcl6qh54eCkipmzuGY3qat4AMGS873CZ4MJdL9gvrC48 0XTPm6s9SyhHcR+rJnEdTYC+rW3R2xQkboWoFeki5CpllULXfVSoDhnJXbH6CelO3Zpsnt 8t0ZtKOQOPkPfaBz7YT7T1qxBJTpKlY5cfRC32/qWKLlQDTJNtl2kliJcvWChqhsqDRP8/ OsECTdfgcCLJfOJ7E+NiGpUgNzHG5FcBsO/ehi6LMzDF8bnnkEvKWbrPTd2Vqg== 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=1777823140; 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=0DYlXuAaYtmj+UBFBSAyEU0UtRIaEX1aV32NFAU/DBU=; b=dAarsqPHLX/DCPkKN4muV6nEjj9Hr5DKuMeNVskyNdPWpek3VzQ8z8mN/aAB3wVyz3UNJy NQoWQV0wFc1zvXRyW/y1/D+IeDxUsqOcOREf8hWgD7cnRtTf2rktH6BeAcEcs5E2qN/Rcs omKZ9RJu3UvWGN18X1itKS9bfhPjudF7JUr9BbEEl6mlqf35BSYCBSNAdpGSe8oiTFilAu bG6D+qZViWtUgjWm1rET3aX1YlVtsYFv1M0mT3jsZAWCTBoCAadwXAx/Ht5cZXTNaNHKPV Y+AKvjGKkeKnDfg+GBqS9wluTmWCXJcjJf8y8rWsiA5b5PtjJBTJudz+XVahwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7pyX3CB7zfhL for ; Sun, 03 May 2026 15:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d4c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 15:45:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 43b1de5970d1 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 43b1de5970d1246aa54d8e34b0f211511cc2b103 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 15:45:40 +0000 Message-Id: <69f76da4.1d4c0.6458a0a8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=43b1de5970d1246aa54d8e34b0f211511cc2b103 commit 43b1de5970d1246aa54d8e34b0f211511cc2b103 Author: Mark Johnston AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Mark Johnston CommitDate: 2026-05-03 14:40:10 +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 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);