summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-06-15 22:27:05 +0800
committerBen Hutchings <ben@decadent.org.uk>2016-11-20 01:16:41 +0000
commit2da0ef6079ec657ff324cee961ec0f6e12305c5b (patch)
tree54d986b6c568f976e08377e907676ff314cdd5b0 /crypto
parentc513d2d61e8e668a4b87c499819d45c656902ee1 (diff)
downloadlinux-stable-2da0ef6079ec657ff324cee961ec0f6e12305c5b.tar.gz
linux-stable-2da0ef6079ec657ff324cee961ec0f6e12305c5b.tar.bz2
linux-stable-2da0ef6079ec657ff324cee961ec0f6e12305c5b.zip
crypto: gcm - Filter out async ghash if necessary
commit b30bdfa86431afbafe15284a3ad5ac19b49b88e3 upstream. As it is if you ask for a sync gcm you may actually end up with an async one because it does not filter out async implementations of ghash. This patch fixes this by adding the necessary filter when looking for ghash. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/gcm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c
index f0bd00b15f26..d2a0f7371cf0 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -716,7 +716,9 @@ static struct crypto_instance *crypto_gcm_alloc_common(struct rtattr **tb,
ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
CRYPTO_ALG_TYPE_HASH,
- CRYPTO_ALG_TYPE_AHASH_MASK);
+ CRYPTO_ALG_TYPE_AHASH_MASK |
+ crypto_requires_sync(algt->type,
+ algt->mask));
if (IS_ERR(ghash_alg))
return ERR_CAST(ghash_alg);