Skip to content

Commit

Permalink
tls: stop recv() if initial process_rx_list gave us non-DATA
Browse files Browse the repository at this point in the history
[ Upstream commit fdfbaec ]

If we have a non-DATA record on the rx_list and another record of the
same type still on the queue, we will end up merging them:
 - process_rx_list copies the non-DATA record
 - we start the loop and process the first available record since it's
   of the same type
 - we break out of the loop since the record was not DATA

Just check the record type and jump to the end in case process_rx_list
did some work.

Fixes: 692d7b5 ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/bd31449e43bd4b6ff546f5c51cf958c31c511deb.1708007371.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
qsn authored and gregkh committed Mar 1, 2024
1 parent 80b1d6a commit 3b952d8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/tls/tls_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1971,7 +1971,7 @@ int tls_sw_recvmsg(struct sock *sk,
goto end;

copied = err;
if (len <= copied)
if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA))
goto end;

target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
Expand Down

0 comments on commit 3b952d8

Please sign in to comment.