diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 13:10:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 13:10:49 -0700 |
| commit | 9e2828a6ead4f04635d0af11e9797934e5e934f5 (patch) | |
| tree | c12203723c7264b150f841d4f04e8db540f54ed1 /crypto/jitterentropy-kcapi.c | |
| parent | fa3dc36db2c62746336c4d5b138871ae8e8507ec (diff) | |
| parent | a4f353ef678a3e189bba959cb57e8542ad588898 (diff) | |
| download | linux-crypto-9e2828a6ead4f04635d0af11e9797934e5e934f5.tar.gz linux-crypto-9e2828a6ead4f04635d0af11e9797934e5e934f5.zip | |
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()
Diffstat (limited to '')
| -rw-r--r-- | crypto/jitterentropy-kcapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c index 6ea1a270..787dccca 100644 --- a/crypto/jitterentropy-kcapi.c +++ b/crypto/jitterentropy-kcapi.c @@ -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"); |