diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
| commit | f90ae1b62bedd8b57966a7be68855f2d43170db6 (patch) | |
| tree | dc332d18219749a17b163d740b8713be5e8d940b /crypto/ahash.c | |
| parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
| parent | 60917545df1ffc7f918550512dc4a14758f74784 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-16.01
Diffstat (limited to 'crypto/ahash.c')
| -rw-r--r-- | crypto/ahash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index f6a36a52d738..c1d8591913e9 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -543,7 +543,8 @@ static int ahash_prepare_alg(struct ahash_alg *alg) struct crypto_alg *base = &alg->halg.base; if (alg->halg.digestsize > PAGE_SIZE / 8 || - alg->halg.statesize > PAGE_SIZE / 8) + alg->halg.statesize > PAGE_SIZE / 8 || + alg->halg.statesize == 0) return -EINVAL; base->cra_type = &crypto_ahash_type; |