hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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()
This commit is contained in:
Linus Torvalds 2019-06-06 13:10:49 -07:00
parent 01047631df 7829a0c1cb
commit ae8766042b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/hmac.c
View File

@ -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;

2
crypto/jitterentropy-kcapi.c
View File

@ -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");