Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux] / crypto / cfb.c

diff --git a/crypto/cfb.c b/crypto/cfb.c
index 94ee39b..a0d68c0 100644 (file)
--- 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);