crypto: gcm - Filter out async ghash if necessary
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 15 Jun 2016 14:27:05 +0000 (22:27 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:01:23 +0000 (01:01 +0000)
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.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
crypto/gcm.c

index 943cbce..9e47c4d 100644 (file)
@@ -711,7 +711,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));
        err = PTR_ERR(ghash_alg);
        if (IS_ERR(ghash_alg))
                return ERR_PTR(err);