Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 787A419E992; Thu, 20 Aug 2026 17:34:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247262; cv=none; b=hE25PTR0GGo66jfc+QxwEsz9Gsn9zINk+uOL57vy4UqMUuZ0UDt8uJT/5GvE8KcDnXjqvUXdMWZ1T37GDc5GngMkm1RelGLVJ5fg0qA6Kr4ZqL7H4Mw4ZD9qEJ0W5LR+4xxHpLvG4ZMNCaecmA4RbuEJzCiHKiCGFK5depHISs0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247262; c=relaxed/simple; bh=Ac6vNZt/Nxa8Ijcclzl9RpMOBQ1F5eNHqnzNGn7npPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMOZIbtkJb5olzCr53Khra2zL904+tQl3gAmYNKomz1DX3cvq1k6lK9uJDn/1n8UcUKjLTiNECBZOhAWgsexCVE2Sb1r4ECuTlROomVmmmG3Cb3Vje4sBrstXorPemPN5sF7pCvwuTh4lM2ku3VYKTGlZU9gceLg5HTWBSyemD8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2MZWgm9w; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2MZWgm9w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A487D1F000E9; Thu, 20 Aug 2026 17:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787247261; bh=s4iej31xPTaiE6QDkn1NroC0LepRwdkx355EgwO6r/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2MZWgm9wxCjp6BLPnAyIDgrEiOTR5bciejQyj6nWJRwRLEMGhtzfw9uEJl67uFEC+ WdEuRmWK1fwfOCao74xsNxUwDW1pTH+++Mef00gnL7PiyHChpLLesTpjqZeINpxHC2 rOxk4BE5fitroyG0lZHitVNV+Ukxz1plZQTrI1Uk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jakub Kicinski , Chuck Lever , Sabrina Dubroca , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 205/220] net/tls: Fail tls_sw_splice_read() after a failed async decrypt Date: Thu, 20 Aug 2026 16:56:35 +0200 Message-ID: <20260820145229.672737951@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145223.480031205@linuxfoundation.org> References: <20260820145223.480031205@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever [ Upstream commit 976df67f463db1fddaf2a32fb04f57ad2891a23d ] When an async decrypt fails, tls_decrypt_done() records the error in ctx->async_wait.err and calls tls_err_abort(), which stores it in sk_err. tls_sw_recvmsg() and tls_sw_read_sock() each read async_wait.err once they hold the reader lock and fail the call: a record that did not authenticate breaks the connection. tls_sw_splice_read() has no such check, and sk_err does not stand in for one. tls_rx_rec_wait() tests sk_err only inside the loop it skips whenever a record is already parsed, and the first reader to reach sock_error() clears it, while async_wait.err persists. A splice therefore keeps delivering records on a connection that recvmsg() and read_sock() refuse to read. Read async_wait.err in tls_sw_splice_read() as the other two readers do. Fixes: f314bfee81b1 ("tls: rx: return the already-copied data on crypto error") Reviewed-by: Jakub Kicinski Signed-off-by: Chuck Lever Reviewed-by: Sabrina Dubroca Link: https://patch.msgid.link/20260806-tls-splice-crypto-fix-v1-1-a2624005a286@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/tls/tls_sw.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index ceca15b43f352..dd8b70914ce1e 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2284,6 +2284,11 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, if (err < 0) return err; + /* If crypto failed the connection is broken */ + err = ctx->async_wait.err; + if (err) + goto splice_read_end; + if (!skb_queue_empty(&ctx->rx_list)) { skb = __skb_dequeue(&ctx->rx_list); } else { -- 2.53.0