From mboxrd@z Thu Jan 1 00:00:00 1970 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 8ED3C3812E9; Thu, 20 Aug 2026 15:20:28 +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=1787239229; cv=none; b=l3ixaHwjQPHk6xYvstkW8i+H6Agf/iRxxnM0OShBN8U/K4JfGbPTCKAoVcLhWuJ/DxHx4LxaUfyIvr/iUs+joZNRUGfeRj0iJFwMJ+bE9foFF6dMg6o/zyccFmsF5fiCXsEsLJz+Cw7SkdjQTfude2t6lY3qpHQwfXxhbmeNTrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787239229; c=relaxed/simple; bh=NsfLZeu5HEFzr+KCDpcQeoJdkG72VYgiDga5iIgutlc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ssX1fJQWCX0HZnkLpTUNFbMYopFMgfwbLhBPNQKeHgvFQEb/6T4bapKIHJAoAJVvHfgxHwOBg94AHGJ5P21XRJ0Fmrn9ofr44bmGKl/P3QBaJLN4SmpFgyoBvdlBHh5DzDjv/9PFzBSZ6wK2QoDiuXRFXKuhZD9O0pcfWQxdYLE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OL1iTnSJ; 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="OL1iTnSJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E915F1F00A3A; Thu, 20 Aug 2026 15:20:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787239228; bh=4IgLR84RznWvwB0pcjbeXI1VtU8SyIguXkPM1qR2wMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OL1iTnSJ64ZXJ9XKzBvYXS4T4e9VNxG0yaMpHOT6CLrSUCZrOq+14rND1fp864AFx oKpdGjL/heBXSHd03mfyMBxL6g/GYqlmMIEY/XF4pdaRaHgAiTVLpu+YZduspJqexR no3NireAqTcVjhKsU3hT9Tyr8rPCc2Nn1YIz1lKQ= 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.18 193/217] net/tls: Fail tls_sw_splice_read() after a failed async decrypt Date: Thu, 20 Aug 2026 16:56:01 +0200 Message-ID: <20260820145243.522776063@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145237.531699751@linuxfoundation.org> References: <20260820145237.531699751@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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 7c3582b3eea9c..4c77036da0711 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2319,6 +2319,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