diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2019-06-20 14:17:24 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-06-20 14:17:24 +0800 |
| commit | bdb275bb6486d19888cb669fedd7d3eea2031669 (patch) | |
| tree | a6d78624f1e8d7a797803636d1d92e6ae584949b /crypto | |
| parent | b0d765219fb3308638754e28f71377d3752f1266 (diff) | |
| parent | 7829a0c1cb9c80debfb4fdb49b4d90019f2ea1ac (diff) | |
| download | linux-bdb275bb6486d19888cb669fedd7d3eea2031669.tar.gz linux-bdb275bb6486d19888cb669fedd7d3eea2031669.tar.bz2 linux-bdb275bb6486d19888cb669fedd7d3eea2031669.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up vmx changes.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/hmac.c | 4 | ||||
| -rw-r--r-- | crypto/jitterentropy-kcapi.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index a68c1266121f..ac8c611ee33e 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -157,6 +157,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)) { + crypto_free_shash(hash); + return -EINVAL; + } ctx->hash = hash; return 0; diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c index 699db1726ead..701b8d86ab49 100644 --- a/crypto/jitterentropy-kcapi.c +++ b/crypto/jitterentropy-kcapi.c @@ -193,7 +193,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"); |