From nobody Thu Apr 16 20:27:57 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 4fxV2C013nz6Zb3n for ; Thu, 16 Apr 2026 20:28:03 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxV2B3Gz7z464L for ; Thu, 16 Apr 2026 20:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776371282; 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=fHjTJ3U7lBAiJ0fUndZe2chJe5CNUMqkC9rWMSFR6Js=; b=LY1z8T2jaLlZ/HngxzDl9y85a0Zm+mu0Q90cTuCnxznJIiRVDr9zigpDYfVcCTkP+vnI2n gH/cwg4pOFcczQMys/Z4ZdvEuMo+mxtwMR44VMUIjD3MDGpubwPvLQlYSLNNoudediDVPn wCXhK++PJnsjqe1I6VQqZqVdH/vP+G6kA9F0tgKdLxcYDC+/JuhUXTpq5R7t5ddEqRrZtj bOoNQl1OKNeC72lC9WuA/Wy5/D/FTr4cCzyohvGPnPel4VEdcur19gtXJd8QfESG2SizFj OqJsdO+mUKq0Q8CIkrpgXoWaH0QPmq0NP05QTesaEblicmjJ9j4TSgdSovBOsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776371282; a=rsa-sha256; cv=none; b=Smj73jaa+aJ5uohMzNQocwz98g3E29pw4PSd/OFyAUv3oah1wpHnnhT5yrjhIRvLvBjwxn U7z9YmJK11RceA1Osk+GeAAUcP7EHPKgp0CWt7zofRZDt2FBy+f8ppS/J00hNj+YBAYG8V lH9VGic2pAmUle4gJKMGhv7P33yjQ6V523lWzjLYmEUcaYhgTys2s8IKebrEGuh7uNvKaQ CBi9WKpSs8sTCQvbvb863G7gvau9B2OOldRt+gG6dIaFBu+RhbouJTdWdVSIHefRVfSxTV N6zSY5Od6ipI8z6UdloiZGReQtqOdyqQyGzjZqeEnM3xkzMVj+BHX8pgVMW2Pg== 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=1776371282; 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=fHjTJ3U7lBAiJ0fUndZe2chJe5CNUMqkC9rWMSFR6Js=; b=tzRUrYGAzMaPSZRXUHzR4HpZoefty/3CLXrKeghPJ26UdQbI3vK5NJwZ6fndv/VfFPsmBp B0K0ecTS6cSSbmpfvp+1QwCe+QZ+GkF2fC5abLt7GS0q3AwQxnt1bmjruoEoPc4H/d/6F5 sDAqc3X4c0Tj1dVF9iE/8ztKoBTnbfZfJjO7sV50JuYH/acVqm3qWfUNceD83G8nXWsFi5 e18e3wGEZO+iYgJnZt9h8iYo6UweUkkMdDA74rLowH4/IeufMIsJE3lGN1spHg3hwhyNNS mO1Bcca9na6XpvlikTqv3KHZmZR+GArTZljPpJf1WdR2gaxHmgAwp6BEDSsxUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxV2B2n5Tz6j0 for ; Thu, 16 Apr 2026 20:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2049c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 20:27:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d88a159da42a - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: d88a159da42a75dbd46ea4f6f9c8059975dab5e8 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 20:27:57 +0000 Message-Id: <69e1464d.2049c.37395e0e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d88a159da42a75dbd46ea4f6f9c8059975dab5e8 commit d88a159da42a75dbd46ea4f6f9c8059975dab5e8 Author: Mark Johnston AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Mark Johnston CommitDate: 2026-04-16 20:27:45 +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 --- 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 45290c29f629..3debec547a80 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1768,7 +1768,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);