Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1d407ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7683c57c dbb018cd

crypto/tcrypt.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -586,12 +586,6 @@ static void test_cipher(char *algo, int enc, 
	j = 0;

	j = 0;

	for (i = 0; i < tcount; i++) {

	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)

		if (template[i].iv)

			memcpy(iv, template[i].iv, MAX_IVLEN);

			memcpy(iv, template[i].iv, MAX_IVLEN);

		else

		else
@@ -613,11 +607,9 @@ static void test_cipher(char *algo, int enc, 
				printk("setkey() failed flags=%x\n",

				printk("setkey() failed flags=%x\n",

						crypto_ablkcipher_get_flags(tfm));

						crypto_ablkcipher_get_flags(tfm));





				if (!template[i].fail) {

				if (!template[i].fail)

					kfree(data);

					goto out;

					goto out;

			}

			}

			}





			temp = 0;

			temp = 0;

			sg_init_table(sg, template[i].np);

			sg_init_table(sg, template[i].np);