crypto: null - Remove VLA usage of skcipher

In the quest to remove all stack VLA usage from the kernel[1], this
replaces struct crypto_skcipher and SKCIPHER_REQUEST_ON_STACK() usage
with struct crypto_sync_skcipher and SYNC_SKCIPHER_REQUEST_ON_STACK(),
which uses a fixed stack size.

[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 6 insertions, 6 deletions

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index c40a8c7ee8ae..eb100a04ce9f 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -42,7 +42,7 @@
 
 struct aead_tfm {
         struct crypto_aead *aead;
-        struct crypto_skcipher *null_tfm;
+        struct crypto_sync_skcipher *null_tfm;
 };
 
 static inline bool aead_sufficient_data(struct sock *sk)
@@ -75,13 +75,13 @@ static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
         return af_alg_sendmsg(sock, msg, size, ivsize);
 }
 
-static int crypto_aead_copy_sgl(struct crypto_skcipher *null_tfm,
+static int crypto_aead_copy_sgl(struct crypto_sync_skcipher *null_tfm,
                                 struct scatterlist *src,
                                 struct scatterlist *dst, unsigned int len)
 {
-        SKCIPHER_REQUEST_ON_STACK(skreq, null_tfm);
+        SYNC_SKCIPHER_REQUEST_ON_STACK(skreq, null_tfm);
 
-        skcipher_request_set_tfm(skreq, null_tfm);
+        skcipher_request_set_sync_tfm(skreq, null_tfm);
         skcipher_request_set_callback(skreq, CRYPTO_TFM_REQ_MAY_BACKLOG,
                                       NULL, NULL);
         skcipher_request_set_crypt(skreq, src, dst, len, NULL);
@@ -99,7 +99,7 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,
         struct af_alg_ctx *ctx = ask->private;
         struct aead_tfm *aeadc = pask->private;
         struct crypto_aead *tfm = aeadc->aead;
-        struct crypto_skcipher *null_tfm = aeadc->null_tfm;
+        struct crypto_sync_skcipher *null_tfm = aeadc->null_tfm;
         unsigned int i, as = crypto_aead_authsize(tfm);
         struct af_alg_async_req *areq;
         struct af_alg_tsgl *tsgl, *tmp;
@@ -478,7 +478,7 @@ static void *aead_bind(const char *name, u32 type, u32 mask)
 {
         struct aead_tfm *tfm;
         struct crypto_aead *aead;
-        struct crypto_skcipher *null_tfm;
+        struct crypto_sync_skcipher *null_tfm;
 
         tfm = kzalloc(sizeof(*tfm), GFP_KERNEL);
         if (!tfm)