tls: Fix zerocopy_from_iter iov handling

[ Upstream commit 4718799817c5a30ae723eda21f3a6c7d8701b1a4 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index db0712b8ddf112dbc50d7bab2a196abe9f77e9a8..b3344bbe336bd3c661d7d8362377704997995d62 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -286,7 +286,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];
 
@@ -337,6 +337,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;
 }
@@ -438,7 +440,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;
 
@@ -826,7 +828,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;