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

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

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a regression that breaks the jitterentropy RNG and a
  potential memory leak in hmac"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hmac - fix memory leak in hmac_init_tfm()
  crypto: jitterentropy - change back to module_init()
parents 01047631 7829a0c1

crypto/hmac.c

+3 −1
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ static int hmac_init_tfm(struct crypto_tfm *tfm) 


	parent->descsize = sizeof(struct shash_desc) +

			   crypto_shash_descsize(hash);

	if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE))

	if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) {

		crypto_free_shash(hash);

		return -EINVAL;

	}



	ctx->hash = hash;

	return 0;

crypto/jitterentropy-kcapi.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static void __exit jent_mod_exit(void) 
	crypto_unregister_rng(&jent_alg);

}



subsys_initcall(jent_mod_init);

module_init(jent_mod_init);

module_exit(jent_mod_exit);



MODULE_LICENSE("Dual BSD/GPL");