| Message ID | e5487514f828e0347d2b92ca40002c62b58af73d.1711120964.git.sd@queasysnail.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7608a971fdeb4c3eefa522d1bfe8d4bc6b2481cc |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tls: recvmsg fixes | expand |
On Mon, Mar 25, 2024 at 04:56:45PM +0100, Sabrina Dubroca wrote: > 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>
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 211f57164cb6..3cdc6bc9fba6 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2152,7 +2152,7 @@ int tls_sw_recvmsg(struct sock *sk, } /* 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
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> --- net/tls/tls_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)