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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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()

Linus Torvalds 6 years ago ae876604 01047631

+4 -2

2 changed files

expand all

crypto

hmac.c

jitterentropy-kcapi.c

+3 -1

crypto/hmac.c

··· 152 152 153 153 parent->descsize = sizeof(struct shash_desc) + 154 154 crypto_shash_descsize(hash); 155 - if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) 155 + if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) { 156 + crypto_free_shash(hash); 156 157 return -EINVAL; 158 + } 157 159 158 160 ctx->hash = hash; 159 161 return 0;

+1 -1

crypto/jitterentropy-kcapi.c

··· 198 198 crypto_unregister_rng(&jent_alg); 199 199 } 200 200 201 - subsys_initcall(jent_mod_init); 201 + module_init(jent_mod_init); 202 202 module_exit(jent_mod_exit); 203 203 204 204 MODULE_LICENSE("Dual BSD/GPL");