summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-06-15 22:27:05 +0800
committerJiri Slaby <jslaby@suse.cz>2016-08-19 09:51:08 +0200
commit27f91af5e9249bad63cab196658f9e9707dde068 (patch)
tree15a7fcc245c3f8b1bfe227f4163e19e74f73c703 /crypto
parent200af313ba237d874ebc4192febad64378b598db (diff)
downloadlwn-27f91af5e9249bad63cab196658f9e9707dde068.tar.gz
lwn-27f91af5e9249bad63cab196658f9e9707dde068.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> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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);