Skip to content

Commit

Permalink
crypto: testmgr - skip crc32c context test for ahash algorithms
Browse files Browse the repository at this point in the history
commit eb5e673 upstream.

Instantiating "cryptd(crc32c)" causes a crypto self-test failure because
the crypto_alloc_shash() in alg_test_crc32c() fails.  This is because
cryptd(crc32c) is an ahash algorithm, not a shash algorithm; so it can
only be accessed through the ahash API, unlike shash algorithms which
can be accessed through both the ahash and shash APIs.

As the test is testing the shash descriptor format which is only
applicable to shash algorithms, skip it for ahash algorithms.

(Note that it's still important to fix crypto self-test failures even
 for weird algorithm instantiations like cryptd(crc32c) that no one
 would really use; in fips_enabled mode unprivileged users can use them
 to panic the kernel, and also they prevent treating a crypto self-test
 failure as a bug when fuzzing the kernel.)

Fixes: 8e3ee85 ("crypto: crc32c - Test descriptor context format")
Cc: [email protected]
Signed-off-by: Eric Biggers <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
ebiggers authored and gregkh committed Mar 23, 2019
1 parent c585808 commit c9e34c3
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions crypto/testmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1894,14 +1894,21 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,

err = alg_test_hash(desc, driver, type, mask);
if (err)
goto out;
return err;

tfm = crypto_alloc_shash(driver, type, mask);
if (IS_ERR(tfm)) {
if (PTR_ERR(tfm) == -ENOENT) {
/*
* This crc32c implementation is only available through
* ahash API, not the shash API, so the remaining part
* of the test is not applicable to it.
*/
return 0;
}
printk(KERN_ERR "alg: crc32c: Failed to load transform for %s: "
"%ld\n", driver, PTR_ERR(tfm));
err = PTR_ERR(tfm);
goto out;
return PTR_ERR(tfm);
}

do {
Expand All @@ -1928,7 +1935,6 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,

crypto_free_shash(tfm);

out:
return err;
}

Expand Down

0 comments on commit c9e34c3

Please sign in to comment.