net/tls: use the new scatterwalk functions

Replace calls to the deprecated function scatterwalk_copychunks() with
memcpy_from_scatterwalk(), memcpy_to_scatterwalk(), or
scatterwalk_skip() as appropriate.  The new functions generally behave
more as expected and eliminate the need to call scatterwalk_done() or
scatterwalk_pagedone().

However, the new functions intentionally do not advance to the next sg
entry right away, which would have broken chain_to_walk() which is
accessing the fields of struct scatter_walk directly.  To avoid this,
replace chain_to_walk() with scatterwalk_get_sglist() which supports the
needed functionality.

Cc: Boris Pismenny <borisp@nvidia.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c
index f9e3d3d90dcf54e41a86cd66f2b286162954803a..03d508a45aaee9218bb2deed542534785f2019d6 100644 (file)
--- a/net/tls/tls_device_fallback.c
+++ b/net/tls/tls_device_fallback.c
@@ -37,17 +37,6 @@
 
 #include "tls.h"
 
-static void chain_to_walk(struct scatterlist *sg, struct scatter_walk *walk)
-{
-       struct scatterlist *src = walk->sg;
-       int diff = walk->offset - src->offset;
-
-       sg_set_page(sg, sg_page(src),
-                   src->length - diff, walk->offset);
-
-       scatterwalk_crypto_chain(sg, sg_next(src), 2);
-}
-
 static int tls_enc_record(struct aead_request *aead_req,
                          struct crypto_aead *aead, char *aad,
                          char *iv, __be64 rcd_sn,
@@ -69,16 +58,13 @@ static int tls_enc_record(struct aead_request *aead_req,
        buf_size = TLS_HEADER_SIZE + cipher_desc->iv;
        len = min_t(int, *in_len, buf_size);
 
-       scatterwalk_copychunks(buf, in, len, 0);
-       scatterwalk_copychunks(buf, out, len, 1);
+       memcpy_from_scatterwalk(buf, in, len);
+       memcpy_to_scatterwalk(out, buf, len);
 
        *in_len -= len;
        if (!*in_len)
                return 0;
 
-       scatterwalk_pagedone(in, 0, 1);
-       scatterwalk_pagedone(out, 1, 1);
-
        len = buf[4] | (buf[3] << 8);
        len -= cipher_desc->iv;
 
@@ -90,8 +76,8 @@ static int tls_enc_record(struct aead_request *aead_req,
        sg_init_table(sg_out, ARRAY_SIZE(sg_out));
        sg_set_buf(sg_in, aad, TLS_AAD_SPACE_SIZE);
        sg_set_buf(sg_out, aad, TLS_AAD_SPACE_SIZE);
-       chain_to_walk(sg_in + 1, in);
-       chain_to_walk(sg_out + 1, out);
+       scatterwalk_get_sglist(in, sg_in + 1);
+       scatterwalk_get_sglist(out, sg_out + 1);
 
        *in_len -= len;
        if (*in_len < 0) {
@@ -110,10 +96,8 @@ static int tls_enc_record(struct aead_request *aead_req,
        }
 
        if (*in_len) {
-               scatterwalk_copychunks(NULL, in, len, 2);
-               scatterwalk_pagedone(in, 0, 1);
-               scatterwalk_copychunks(NULL, out, len, 2);
-               scatterwalk_pagedone(out, 1, 1);
+               scatterwalk_skip(in, len);
+               scatterwalk_skip(out, len);
        }
 
        len -= cipher_desc->tag;
@@ -162,9 +146,6 @@ static int tls_enc_records(struct aead_request *aead_req,
 
        } while (rc == 0 && len);
 
-       scatterwalk_done(&in, 0, 0);
-       scatterwalk_done(&out, 1, 0);
-
        return rc;
 }