OSDN Git Service

crypto: tcrypt - do not allocate iv on stack for aead speed tests
authorCristian Stoica <cristian.stoica@freescale.com>
Wed, 28 Jan 2015 11:07:32 +0000 (13:07 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 4 Feb 2015 09:59:42 +0000 (20:59 +1100)
See also: 9bac019dad8098a77cce555d929f678e22111783

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/tcrypt.c

index 2b2486a..4b9e23f 100644 (file)
@@ -280,16 +280,20 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
        struct scatterlist *sgout;
        const char *e;
        void *assoc;
-       char iv[MAX_IVLEN];
+       char *iv;
        char *xbuf[XBUFSIZE];
        char *xoutbuf[XBUFSIZE];
        char *axbuf[XBUFSIZE];
        unsigned int *b_size;
        unsigned int iv_len;
 
+       iv = kzalloc(MAX_IVLEN, GFP_KERNEL);
+       if (!iv)
+               return;
+
        if (aad_size >= PAGE_SIZE) {
                pr_err("associate data length (%u) too big\n", aad_size);
-               return;
+               goto out_noxbuf;
        }
 
        if (enc == ENCRYPT)
@@ -355,7 +359,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,
 
                        iv_len = crypto_aead_ivsize(tfm);
                        if (iv_len)
-                               memset(&iv, 0xff, iv_len);
+                               memset(iv, 0xff, iv_len);
 
                        crypto_aead_clear_flags(tfm, ~0);
                        printk(KERN_INFO "test %u (%d bit key, %d byte blocks): ",
@@ -408,6 +412,7 @@ out_nooutbuf:
 out_noaxbuf:
        testmgr_free_buf(xbuf);
 out_noxbuf:
+       kfree(iv);
        return;
 }