]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: ahash - ensure statesize is non-zero
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 9 Oct 2015 19:43:33 +0000 (20:43 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 16 Nov 2015 11:26:48 +0000 (11:26 +0000)
commit 8996eafdcbad149ac0f772fb1649fbb75c482a6a upstream.

Unlike shash algorithms, ahash drivers must implement export
and import as their descriptors may contain hardware state and
cannot be exported as is.  Unfortunately some ahash drivers did
not provide them and end up causing crashes with algif_hash.

This patch adds a check to prevent these drivers from registering
ahash algorithms until they are fixed.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
crypto/ahash.c

index f2a5d8f656ff44dea2c78aa1b31add76796cb3c5..d3e86a46ecead289b31b0c274c193d958edbf602 100644 (file)
@@ -537,7 +537,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;