diff options
| author | Boris Pismenny <borisp@mellanox.com> | 2018-07-13 14:33:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-16 00:13:11 -0700 |
| commit | 4718799817c5a30ae723eda21f3a6c7d8701b1a4 (patch) | |
| tree | a014c9c6f4414480c86e0a8141b1cd94c8fa6998 | |
| parent | 4799ac81e52a72a6404827bf2738337bb581a174 (diff) | |
| download | linux-4718799817c5a30ae723eda21f3a6c7d8701b1a4.tar.gz linux-4718799817c5a30ae723eda21f3a6c7d8701b1a4.tar.bz2 linux-4718799817c5a30ae723eda21f3a6c7d8701b1a4.zip | |
tls: Fix zerocopy_from_iter iov handling
zerocopy_from_iter iterates over the message, but it doesn't revert the
updates made by the iov iteration. This patch fixes it. Now, the iov can
be used after calling zerocopy_from_iter.
Fixes: 3c4d75591 ("tls: kernel TLS support")
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tls/tls_sw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index fe5735c57774..7d194c0cd6cf 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -263,7 +263,7 @@ static int zerocopy_from_iter(struct sock *sk, struct iov_iter *from, int length, int *pages_used, unsigned int *size_used, struct scatterlist *to, int to_max_pages, - bool charge) + bool charge, bool revert) { struct page *pages[MAX_SKB_FRAGS]; @@ -314,6 +314,8 @@ static int zerocopy_from_iter(struct sock *sk, struct iov_iter *from, out: *size_used = size; *pages_used = num_elem; + if (revert) + iov_iter_revert(from, size); return rc; } @@ -415,7 +417,7 @@ alloc_encrypted: &ctx->sg_plaintext_size, ctx->sg_plaintext_data, ARRAY_SIZE(ctx->sg_plaintext_data), - true); + true, false); if (ret) goto fallback_to_reg_send; @@ -825,7 +827,7 @@ int tls_sw_recvmsg(struct sock *sk, err = zerocopy_from_iter(sk, &msg->msg_iter, to_copy, &pages, &chunk, &sgin[1], - MAX_SKB_FRAGS, false); + MAX_SKB_FRAGS, false, true); if (err < 0) goto fallback_to_reg_recv; |