diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-04 11:26:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-17 08:50:26 +0100 |
| commit | 715396cca2ce2df9149054fb6fabc8d27d8b9d8e (patch) | |
| tree | 4675398cc083d6ecb9a8b57d8f765bb725714255 /net/tls | |
| parent | 0ce686fcab322c696f78f1bb93af259b6e3fa46a (diff) | |
| download | linux-stable-715396cca2ce2df9149054fb6fabc8d27d8b9d8e.tar.gz linux-stable-715396cca2ce2df9149054fb6fabc8d27d8b9d8e.tar.bz2 linux-stable-715396cca2ce2df9149054fb6fabc8d27d8b9d8e.zip | |
net: tls: fix device-offloaded sendpage straddling records
[ Upstream commit e539a105f947b9db470fec39fe91d85fe737a432 ]
Adrien reports that incorrect data is transmitted when a single
page straddles multiple records. We would transmit the same
data in all iterations of the loop.
Reported-by: Adrien Moulin <amoulin@corp.free.fr>
Link: https://lore.kernel.org/all/61481278.42813558.1677845235112.JavaMail.zimbra@corp.free.fr
Fixes: c1318b39c7d3 ("tls: Add opt-in zerocopy mode of sendfile()")
Tested-by: Adrien Moulin <amoulin@corp.free.fr>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Acked-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Link: https://lore.kernel.org/r/20230304192610.3818098-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 6c593788dc25..a7cc4f9faac2 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -508,6 +508,8 @@ handle_error: zc_pfrag.offset = iter_offset.offset; zc_pfrag.size = copy; tls_append_frag(record, &zc_pfrag, copy); + + iter_offset.offset += copy; } else if (copy) { copy = min_t(size_t, copy, pfrag->size - pfrag->offset); |