crypto: remove several VLAs

We avoid various VLAs[1] by using constant expressions for block size
and alignment mask.

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

Signed-off-by: Salvatore Mesoraca <s.mesoraca16@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 4 deletions

diff --git a/crypto/cfb.c b/crypto/cfb.c
index 94ee39bed758..a0d68c09e1b9 100644
--- a/crypto/cfb.c
+++ b/crypto/cfb.c
@@ -53,9 +53,8 @@ static void crypto_cfb_encrypt_one(struct crypto_skcipher *tfm,
 static void crypto_cfb_final(struct skcipher_walk *walk,
                              struct crypto_skcipher *tfm)
 {
-        const unsigned int bsize = crypto_cfb_bsize(tfm);
         const unsigned long alignmask = crypto_skcipher_alignmask(tfm);
-        u8 tmp[bsize + alignmask];
+        u8 tmp[MAX_CIPHER_BLOCKSIZE + MAX_CIPHER_ALIGNMASK];
         u8 *stream = PTR_ALIGN(tmp + 0, alignmask + 1);
         u8 *src = walk->src.virt.addr;
         u8 *dst = walk->dst.virt.addr;
@@ -94,7 +93,7 @@ static int crypto_cfb_encrypt_inplace(struct skcipher_walk *walk,
         unsigned int nbytes = walk->nbytes;
         u8 *src = walk->src.virt.addr;
         u8 *iv = walk->iv;
-        u8 tmp[bsize];
+        u8 tmp[MAX_CIPHER_BLOCKSIZE];
 
         do {
                 crypto_cfb_encrypt_one(tfm, iv, tmp);
@@ -164,7 +163,7 @@ static int crypto_cfb_decrypt_inplace(struct skcipher_walk *walk,
         unsigned int nbytes = walk->nbytes;
         u8 *src = walk->src.virt.addr;
         u8 *iv = walk->iv;
-        u8 tmp[bsize];
+        u8 tmp[MAX_CIPHER_BLOCKSIZE];
 
         do {
                 crypto_cfb_encrypt_one(tfm, iv, tmp);