Commit 96c82175 authored by Mimi Zohar's avatar Mimi Zohar
Browse files

Merge branch 'next-integrity.logging-cleanup' into next-integrity 

From the cover-letter:

The log messages from integrity subsystem should be consistent for better
diagnosability and discoverability.

This patch set improves the logging by removing duplicate log formatting
macros, adding a consistent prefix to the log messages, and adding new
log messages where necessary.
parents f8788d86 555d6d71

security/integrity/digsig.c

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
 * Dmitry Kasatkin <dmitry.kasatkin@intel.com>

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/err.h>

#include <linux/sched.h>

#include <linux/slab.h>

security/integrity/digsig_asymmetric.c

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
 * Dmitry Kasatkin <dmitry.kasatkin@intel.com>

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/err.h>

#include <linux/ratelimit.h>

#include <linux/key-type.h>

security/integrity/evm/evm_crypto.c

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 *	 Using root's kernel master key (kmk), calculate the HMAC

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/export.h>

#include <linux/crypto.h>

#include <linux/xattr.h>

security/integrity/evm/evm_main.c

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
 *	evm_inode_removexattr, and evm_verifyxattr

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/init.h>

#include <linux/crypto.h>

#include <linux/audit.h>

security/integrity/evm/evm_secfs.c

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 *	- Get the key and enable EVM

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/audit.h>

#include <linux/uaccess.h>

#include <linux/init.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE