summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-06-15 22:27:05 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-16 09:33:19 +0200
commitda4a784ef9f079d35afc9c744755e11cb675f7da (patch)
tree59ee90bc7998f90da9769ff763ce937aaf07a1f0
parent3e52fe171cbe1ba444c7d3ecabc39af61a32390e (diff)
downloadlwn-da4a784ef9f079d35afc9c744755e11cb675f7da.tar.gz
lwn-da4a784ef9f079d35afc9c744755e11cb675f7da.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--crypto/gcm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c
index bec329b3de8d..d9ea5f9c0574 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -639,7 +639,9 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
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 PTR_ERR(ghash_alg);