Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / crypto / seqiv.c

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 9daa854..b7bb9a2 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -267,6 +267,12 @@ static struct crypto_instance *seqiv_ablkcipher_alloc(struct rtattr **tb)
        if (IS_ERR(inst))
                goto out;
 
+       if (inst->alg.cra_ablkcipher.ivsize < sizeof(u64)) {
+               skcipher_geniv_free(inst);
+               inst = ERR_PTR(-EINVAL);
+               goto out;
+       }
+
        inst->alg.cra_ablkcipher.givencrypt = seqiv_givencrypt_first;
 
        inst->alg.cra_init = seqiv_init;
@@ -287,6 +293,12 @@ static struct crypto_instance *seqiv_aead_alloc(struct rtattr **tb)
        if (IS_ERR(inst))
                goto out;
 
+       if (inst->alg.cra_aead.ivsize < sizeof(u64)) {
+               aead_geniv_free(inst);
+               inst = ERR_PTR(-EINVAL);
+               goto out;
+       }
+
        inst->alg.cra_aead.givencrypt = seqiv_aead_givencrypt_first;
 
        inst->alg.cra_init = seqiv_aead_init;