]> git.karo-electronics.de Git - linux-beck.git/commitdiff
crypto: aead - Fix corner case in crypto_lookup_aead
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 23 Apr 2015 08:37:46 +0000 (16:37 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sun, 26 Apr 2015 06:33:16 +0000 (14:33 +0800)
When the user explicitly states that they don't care whether the
algorithm has been tested (type = CRYPTO_ALG_TESTED and mask = 0),
there is a corner case where we may erroneously return ENOENT.

This patch fixes it by correcting the logic in the test.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/aead.c

index 222271070b49189bf2671acb1aee5a9ecc92ecc8..d6ad0c66ee835eeec289be4a68d9bb864847c57b 100644 (file)
@@ -489,7 +489,7 @@ struct crypto_alg *crypto_lookup_aead(const char *name, u32 type, u32 mask)
                return alg;
 
        if (alg->cra_type == &crypto_aead_type) {
-               if ((alg->cra_flags ^ type ^ ~mask) & CRYPTO_ALG_TESTED) {
+               if (~alg->cra_flags & (type ^ ~mask) & CRYPTO_ALG_TESTED) {
                        crypto_mod_put(alg);
                        alg = ERR_PTR(-ENOENT);
                }