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 | 34e315f0447ecae19f9c9d95aa322e3869c332e5 (patch) | |
| tree | 622972f2dba21b95a75da0154ad351ec6dc394f2 /crypto/hmac.c | |
| parent | f3d7d849c549142fc086c9bfbf1e1df68b64eb90 (diff) | |
| parent | a4f353ef678a3e189bba959cb57e8542ad588898 (diff) | |
| download | linux-crypto-34e315f0447ecae19f9c9d95aa322e3869c332e5.tar.gz linux-crypto-34e315f0447ecae19f9c9d95aa322e3869c332e5.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 '')
| -rw-r--r-- | crypto/hmac.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index a68c1266..ac8c611e 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; |