diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
| commit | b1c501e5b5a165228b7d2819265bc70ec610da01 (patch) | |
| tree | 0e36c93144245c3b0641e24bbae2047256c1057f /crypto/tcrypt.c | |
| parent | ee1ee76b601e4de16246fc4d3f261f4a0c82b01d (diff) | |
| parent | 4da3cf2ff4a51349887201dd1efa1dfbc3a99703 (diff) | |
| download | linux-crypto-b1c501e5b5a165228b7d2819265bc70ec610da01.tar.gz linux-crypto-b1c501e5b5a165228b7d2819265bc70ec610da01.zip | |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 6beabc5a..e47f6e02 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -586,12 +586,6 @@ static void test_cipher(char *algo, int enc, j = 0; for (i = 0; i < tcount; i++) { - data = kzalloc(template[i].ilen, GFP_KERNEL); - if (!data) - continue; - - memcpy(data, template[i].input, template[i].ilen); - if (template[i].iv) memcpy(iv, template[i].iv, MAX_IVLEN); else @@ -613,10 +607,8 @@ static void test_cipher(char *algo, int enc, printk("setkey() failed flags=%x\n", crypto_ablkcipher_get_flags(tfm)); - if (!template[i].fail) { - kfree(data); + if (!template[i].fail) goto out; - } } temp = 0; |