]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
crypto: adiantum - Use memcpy_{to,from}_sglist()
authorEric Biggers <ebiggers@kernel.org>
Thu, 11 Dec 2025 01:18:40 +0000 (17:18 -0800)
committerEric Biggers <ebiggers@kernel.org>
Mon, 12 Jan 2026 19:07:50 +0000 (11:07 -0800)
Call the newer, easier-to-read functions memcpy_to_sglist() and
memcpy_from_sglist() directly instead of calling
scatterwalk_map_and_copy().  No change in behavior.

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Link: https://lore.kernel.org/r/20251211011846.8179-9-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
crypto/adiantum.c

index 519e95228ad84e36472b6c36b3ae4d45dab2ab47..6d882f926ab08653bd49c9c3f9b37249f6b6e09c 100644 (file)
@@ -427,8 +427,8 @@ static int adiantum_finish(struct skcipher_request *req)
                /* Slow path that works for any destination scatterlist */
                adiantum_hash_message(req, dst, &digest);
                le128_sub(&rctx->rbuf.bignum, &rctx->rbuf.bignum, &digest);
-               scatterwalk_map_and_copy(&rctx->rbuf.bignum, dst,
-                                        bulk_len, sizeof(le128), 1);
+               memcpy_to_sglist(dst, bulk_len, &rctx->rbuf.bignum,
+                                sizeof(le128));
        }
        return 0;
 }
@@ -477,8 +477,8 @@ static int adiantum_crypt(struct skcipher_request *req, bool enc)
        } else {
                /* Slow path that works for any source scatterlist */
                adiantum_hash_message(req, src, &digest);
-               scatterwalk_map_and_copy(&rctx->rbuf.bignum, src,
-                                        bulk_len, sizeof(le128), 0);
+               memcpy_from_sglist(&rctx->rbuf.bignum, src, bulk_len,
+                                  sizeof(le128));
        }
        le128_add(&rctx->rbuf.bignum, &rctx->rbuf.bignum, &rctx->header_hash);
        le128_add(&rctx->rbuf.bignum, &rctx->rbuf.bignum, &digest);