diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 14:49:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 14:49:46 -0700 |
| commit | 7f218319caaaf6f2a43b22d8c82b898f32b4ec70 (patch) | |
| tree | d4be6632e7c8d599815a0944686b96d7bb215c20 /security/integrity/integrity.h | |
| parent | 6cad420cc695867b4ca710bac21fde21a4102e4b (diff) | |
| parent | 9e2b4be377f0d715d9d910507890f9620cc22a9d (diff) | |
| download | linux-7f218319caaaf6f2a43b22d8c82b898f32b4ec70.tar.bz2 | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity updates from Mimi Zohar:
"Just a couple of updates for linux-5.7:
- A new Kconfig option to enable IMA architecture specific runtime
policy rules needed for secure and/or trusted boot, as requested.
- Some message cleanup (eg. pr_fmt, additional error messages)"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
ima: add a new CONFIG for loading arch-specific policies
integrity: Remove duplicate pr_fmt definitions
IMA: Add log statements for failure conditions
IMA: Update KBUILD_MODNAME for IMA files to ima
Diffstat (limited to 'security/integrity/integrity.h')
| -rw-r--r-- | security/integrity/integrity.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 73fc286834d7..298b73794d8b 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -6,6 +6,12 @@ * Mimi Zohar <zohar@us.ibm.com> */ +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/types.h> #include <linux/integrity.h> #include <crypto/sha.h> |