]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net/tls: fix lowat calculation if some data came from previous record
authorJakub Kicinski <jakub.kicinski@netronome.com>
Fri, 24 May 2019 17:34:30 +0000 (10:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 4 Jun 2019 05:59:44 +0000 (07:59 +0200)
commit2b4435b877d80fc0d048009c3cf289cb55797f4f
tree9c93dc84fe34d1ced8d847f35c1ff82e349a8ee1
parent7b16eb9190b2eb4d2a063260f9951c859bc850ad
net/tls: fix lowat calculation if some data came from previous record

[ Upstream commit 46a1695960d0600d58da7af33c65f24f3d839674 ]

If some of the data came from the previous record, i.e. from
the rx_list it had already been decrypted, so it's not counted
towards the "decrypted" variable, but the "copied" variable.
Take that into account when checking lowat.

When calculating lowat target we need to pass the original len.
E.g. if lowat is at 80, len is 100 and we had 30 bytes on rx_list
target would currently be incorrectly calculated as 70, even though
we only need 50 more bytes to make up the 80.

Fixes: 692d7b5d1f91 ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Tested-by: David Beckett <david.beckett@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/tls/tls_sw.c