Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[uclinux-h8/linux.git] / crypto / seqiv.c

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 64a412b..ed1b0e9 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -89,13 +89,12 @@ static int seqiv_aead_encrypt(struct aead_request *req)
 
        if (unlikely(!IS_ALIGNED((unsigned long)info,
                                 crypto_aead_alignmask(geniv) + 1))) {
-               info = kmalloc(ivsize, req->base.flags &
-                                      CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL:
-                                                                 GFP_ATOMIC);
+               info = kmemdup(req->iv, ivsize, req->base.flags &
+                              CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
+                              GFP_ATOMIC);
                if (!info)
                        return -ENOMEM;
 
-               memcpy(info, req->iv, ivsize);
                compl = seqiv_aead_encrypt_complete;
                data = req;
        }