1 files changed, 6 insertions, 0 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 03fb5facf0b4..f6f08336df5d 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -183,6 +183,12 @@ EXPORT_SYMBOL_GPL(crypto_givcipher_type);
 
 const char *crypto_default_geniv(const struct crypto_alg *alg)
 {
+        if (((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
+             CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
+                                         alg->cra_ablkcipher.ivsize) !=
+            alg->cra_blocksize)
+                return "chainiv";
+
         return alg->cra_flags & CRYPTO_ALG_ASYNC ?
                "eseqiv" : skcipher_default_geniv;
 }