MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-18 23:29:57 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: fips140: adjust some log messages

Browse Source 
Downgrade some expected log messages from pr_warn() to pr_info().

Also remove "FIPS 140" from some log messages since the messages are
already prefixed with "fips140: " (the name of the module) which makes
it redundant.

Bug: 153614920
Bug: 188620248
Change-Id: I94055d7a5a86a770fcf38e958e7d7497b4bafdf0
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2021-07-02 16:25:20 -07:00
parent 091338cb39
commit c799c6644b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/fips140-module.c
View File

@ -250,8 +250,8 @@ static bool __init check_fips140_module_hmac(void)
textsize = &__fips140_text_end - &__fips140_text_start; textsize = &__fips140_text_end - &__fips140_text_start;
rodatasize = &__fips140_rodata_end - &__fips140_rodata_start; rodatasize = &__fips140_rodata_end - &__fips140_rodata_start;
pr_warn("text size : 0x%x\n", textsize); pr_info("text size : 0x%x\n", textsize);
pr_warn("rodata size: 0x%x\n", rodatasize); pr_info("rodata size: 0x%x\n", rodatasize);
textcopy = kmalloc(textsize + rodatasize, GFP_KERNEL); textcopy = kmalloc(textsize + rodatasize, GFP_KERNEL);
if (!textcopy) { if (!textcopy) {
@ -283,7 +283,7 @@ static bool __init check_fips140_module_hmac(void)
return false; return false;
} }
pr_warn("using '%s' for integrity check\n", pr_info("using '%s' for integrity check\n",
crypto_shash_driver_name(desc->tfm)); crypto_shash_driver_name(desc->tfm));
err = crypto_shash_setkey(desc->tfm, fips140_integ_hmac_key, err = crypto_shash_setkey(desc->tfm, fips140_integ_hmac_key,
@ -528,7 +528,7 @@ fips140_init(void)
{ {
const u32 *initcall; const u32 *initcall;
pr_info("Loading FIPS 140 module\n"); pr_info("loading module\n");
unregister_existing_fips140_algos(); unregister_existing_fips140_algos();
@ -564,12 +564,12 @@ fips140_init(void)
*/ */
if (!check_fips140_module_hmac()) { if (!check_fips140_module_hmac()) {
pr_crit("FIPS 140 integrity check failed -- giving up!\n"); pr_crit("integrity check failed -- giving up!\n");
goto panic; goto panic;
} }
pr_info("integrity check passed\n");
pr_info("FIPS 140 integrity check successful\n"); pr_info("module successfully loaded\n");
pr_info("FIPS 140 module successfully loaded\n");
return 0; return 0;
panic: panic: