Skip to content

Commit

Permalink
ima: silence measurement list hexdump during kexec
Browse files Browse the repository at this point in the history
Directly calling print_hex_dump() dumps the IMA measurement list on soft
resets (kexec) straight to the syslog (kmsg/dmesg) without considering the
DEBUG flag or the dynamic debug state, causing the output to be always
printed, including during boot time.

Since this output is only valid for IMA debugging, but not necessary on
normal kexec operation, print_hex_dump_debug() adheres to the pr_debug()
behavior: the dump is only printed to syslog when DEBUG is defined or when
explicitly requested by the user through dynamic debugging.

Signed-off-by: Bruno Meneguele <[email protected]>
Signed-off-by: Mimi Zohar <[email protected]>
  • Loading branch information
bmeneg authored and mimizohar committed Jan 5, 2022
1 parent 9be6dc8 commit 520451e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions security/integrity/ima/ima_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer,
}
memcpy(file.buf, &khdr, sizeof(khdr));

print_hex_dump(KERN_DEBUG, "ima dump: ", DUMP_PREFIX_NONE,
16, 1, file.buf,
file.count < 100 ? file.count : 100, true);
print_hex_dump_debug("ima dump: ", DUMP_PREFIX_NONE, 16, 1,
file.buf, file.count < 100 ? file.count : 100,
true);

*buffer_size = file.count;
*buffer = file.buf;
Expand Down

0 comments on commit 520451e

Please sign in to comment.