From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 96D8F749C; Tue, 26 Aug 2025 11:47:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756208871; cv=none; b=UE2CbaZqX1yws7ZEag9jctZ4/HAiEYgekLuB86IPK9HIVjH4Z5QMHYVsw2WBkf4j9slaHMzPmlR/X2Sp613+s9NXkVlw9QylMjs+KmGwQVZWsqG2UuYAt9kEjuv9IzpFPnDrerprRFRUFA0tyM/YfDJEHa3LPb2t/Wpy67tNxyQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756208871; c=relaxed/simple; bh=j9g3X6WbQTZEhQwMPqk0l9Zg3rbKPbK59cLrBDdMVkY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kt1Mh+89uUzwpiuuIYqrsxc8Yvxp0II06kPNDPwyn7qkk7DZIj2mC6ZOMGd1p92I1Pob7lwtOKlVrM7QMwBWxAjj1PJIXmHmwVxGvaJ19qtntUjlK9YukTrK40F6rjW9pUr0cR54bjiF1iq4XumsC40eYWEKrMgrSykk3JrhheU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qe/Tfetx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Qe/Tfetx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2773EC4CEF1; Tue, 26 Aug 2025 11:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756208871; bh=j9g3X6WbQTZEhQwMPqk0l9Zg3rbKPbK59cLrBDdMVkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qe/TfetxDSu5xt9j4PecWXRlFyYKSIQnuNYtR6kIXLoLJr2HeOfRpV/2PHIorue+X 1pzm0iWXIqPyK1XLu382aLRbdC8y9cY3036YhxIrPpXmDu2jGcpnyFMMcwUDJ7ERLZ bA0/IDBjlCVDwagYYrLfA65kTNbYmGSNskjjBWvw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Muhammad Alifa Ramdhan , Billy Jheng Bing-Jhong , Sabrina Dubroca , Jakub Kicinski Subject: [PATCH 6.12 246/322] tls: fix handling of zero-length records on the rx_list Date: Tue, 26 Aug 2025 13:11:01 +0200 Message-ID: <20250826110921.995588423@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110915.169062587@linuxfoundation.org> References: <20250826110915.169062587@linuxfoundation.org> User-Agent: quilt/0.68 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: Jakub Kicinski commit 62708b9452f8eb77513115b17c4f8d1a22ebf843 upstream. Each recvmsg() call must process either - only contiguous DATA records (any number of them) - one non-DATA record If the next record has different type than what has already been processed we break out of the main processing loop. If the record has already been decrypted (which may be the case for TLS 1.3 where we don't know type until decryption) we queue the pending record to the rx_list. Next recvmsg() will pick it up from there. Queuing the skb to rx_list after zero-copy decrypt is not possible, since in that case we decrypted directly to the user space buffer, and we don't have an skb to queue (darg.skb points to the ciphertext skb for access to metadata like length). Only data records are allowed zero-copy, and we break the processing loop after each non-data record. So we should never zero-copy and then find out that the record type has changed. The corner case we missed is when the initial record comes from rx_list, and it's zero length. Reported-by: Muhammad Alifa Ramdhan Reported-by: Billy Jheng Bing-Jhong Fixes: 84c61fe1a75b ("tls: rx: do not use the standard strparser") Reviewed-by: Sabrina Dubroca Link: https://patch.msgid.link/20250820021952.143068-1-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/tls/tls_sw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1774,6 +1774,9 @@ int decrypt_skb(struct sock *sk, struct return tls_decrypt_sg(sk, NULL, sgout, &darg); } +/* All records returned from a recvmsg() call must have the same type. + * 0 is not a valid content type. Use it as "no type reported, yet". + */ static int tls_record_content_type(struct msghdr *msg, struct tls_msg *tlm, u8 *control) { @@ -2017,8 +2020,10 @@ int tls_sw_recvmsg(struct sock *sk, if (err < 0) goto end; + /* process_rx_list() will set @control if it processed any records */ copied = err; - if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA) || rx_more) + if (len <= copied || rx_more || + (control && control != TLS_RECORD_TYPE_DATA)) goto end; target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);