diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2024-02-15 17:17:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-01 13:16:51 +0100 |
| commit | 31e10d6cb0c9532ff070cf50da1657c3acee9276 (patch) | |
| tree | bdd7ab311a846a47ca7509aa63be2b8d7ac7c6b9 | |
| parent | 7c54eaa3b078576024fef97fde3d2dabf13efa97 (diff) | |
| download | linux-stable-31e10d6cb0c9532ff070cf50da1657c3acee9276.tar.gz linux-stable-31e10d6cb0c9532ff070cf50da1657c3acee9276.tar.bz2 linux-stable-31e10d6cb0c9532ff070cf50da1657c3acee9276.zip | |
tls: stop recv() if initial process_rx_list gave us non-DATA
[ Upstream commit fdfbaec5923d9359698cbb286bc0deadbb717504 ]
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: 692d7b5d1f91 ("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>
| -rw-r--r-- | net/tls/tls_sw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 732f96b7bafc..46f1c19f7c60 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1786,7 +1786,7 @@ int tls_sw_recvmsg(struct sock *sk, } copied = err; - if (len <= copied) + if (len <= copied || (copied && control != TLS_RECORD_TYPE_DATA)) goto end; target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); |