diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-09 03:10:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-09 03:10:51 +0200 |
| commit | f1d407efbe59ff1a450f0ec7a486a768acaa2949 (patch) | |
| tree | a481b317df865e4f19ed0e797ac57a0bfe2233e3 | |
| parent | kernel/printk.c: Made printk_recursion_bug_msg static. (diff) | |
| parent | crypto: tcrypt - Fix memory leak in test_cipher (diff) | |
| download | linux-f1d407efbe59ff1a450f0ec7a486a768acaa2949.tar.xz linux-f1d407efbe59ff1a450f0ec7a486a768acaa2949.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: tcrypt - Fix memory leak in test_cipher
| -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 6beabc5abd07..e47f6e02133c 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; |