The crypto code prints log messages with algorithm name and driver name in multiple places, usually as "$alg ($driver)", but sometimes as "$driver ($alg)", which is confusing.
To remove all ambiguity, standardize on "$alg (driver $driver)". Signed-off-by: Vegard Nossum <[email protected]> --- crypto/testmgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index ee33ba21ae2b..47764fc879bb 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -5753,7 +5753,7 @@ static int alg_find_test(const char *alg) static int alg_fips_disabled(const char *driver, const char *alg) { - pr_info("alg: %s (%s) is disabled due to FIPS\n", alg, driver); + pr_info("alg: %s (driver %s) is disabled due to FIPS\n", alg, driver); return -ECANCELED; } @@ -5814,18 +5814,18 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) if (rc) { if (fips_enabled) { fips_fail_notify(); - panic("alg: self-tests for %s (%s) failed in fips mode!\n", - driver, alg); + panic("alg: self-tests for %s (driver %s) failed in fips mode!\n", + alg, driver); } - pr_warn("alg: self-tests for %s using %s failed (rc=%d)", + pr_warn("alg: self-tests for %s (driver %s) failed (rc=%d)", alg, driver, rc); WARN(rc != -ENOENT, - "alg: self-tests for %s using %s failed (rc=%d)", + "alg: self-tests for %s (driver %s) failed (rc=%d)", alg, driver, rc); } else { if (fips_enabled) - pr_info("alg: self-tests for %s (%s) passed\n", - driver, alg); + pr_info("alg: self-tests for %s (driver %s) passed\n", + alg, driver); } return rc; @@ -5850,7 +5850,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) } notest2: - printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver); + printk(KERN_INFO "alg: No test for %s (driver %s)\n", alg, driver); if (type & CRYPTO_ALG_FIPS_INTERNAL) return alg_fips_disabled(driver, alg); -- 2.39.3
