]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
tls: recv: process_rx_list shouldn't use an offset with kvec
authorSabrina Dubroca <sd@queasysnail.net>
Mon, 25 Mar 2024 15:56:45 +0000 (16:56 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 27 Mar 2024 03:48:24 +0000 (20:48 -0700)
Only MSG_PEEK needs to copy from an offset during the final
process_rx_list call, because the bytes we copied at the beginning of
tls_sw_recvmsg were left on the rx_list. In the KVEC case, we removed
data from the rx_list as we were copying it, so there's no need to use
an offset, just like in the normal case.

Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/e5487514f828e0347d2b92ca40002c62b58af73d.1711120964.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/tls/tls_sw.c

index 211f57164cb611fd2665f682906be96aa35463ed..3cdc6bc9fba6901d543fe9b377b3c06f72b5c84f 100644 (file)
@@ -2152,7 +2152,7 @@ recv_end:
                }
 
                /* Drain records from the rx_list & copy if required */
-               if (is_peek || is_kvec)
+               if (is_peek)
                        err = process_rx_list(ctx, msg, &control, copied + peeked,
                                              decrypted - peeked, is_peek, NULL);
                else