diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-23 10:34:47 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-26 08:33:15 +0200 |
| commit | 26739535206e819946b0740347c09c94c4e48ba9 (patch) | |
| tree | 678fc485236b97f801f33d2ee1c2b32eb84df2e1 | |
| parent | crypto: api - Fix build error when modules are disabled (diff) | |
| download | linux-26739535206e819946b0740347c09c94c4e48ba9.tar.xz linux-26739535206e819946b0740347c09c94c4e48ba9.zip | |
crypto: skcipher - Fix corner case in crypto_lookup_skcipher
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>
| -rw-r--r-- | crypto/ablkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index db201bca1581..b3dded4558c1 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -636,7 +636,7 @@ struct crypto_alg *crypto_lookup_skcipher(const char *name, u32 type, u32 mask) if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_GIVCIPHER) { - 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); } |