linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mimi Zohar <zohar@linux.ibm.com>
To: Tushar Sugandhi <tusharsu@linux.microsoft.com>,
	joe@perches.com, skhan@linuxfoundation.org,
	linux-integrity@vger.kernel.org
Cc: sashal@kernel.org, nramas@linux.microsoft.com,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 3/3] IMA: Remove duplicate pr_fmt definitions
Date: Sun, 16 Feb 2020 07:40:51 -0500	[thread overview]
Message-ID: <1581856851.8515.169.camel@linux.ibm.com> (raw)
In-Reply-To: <20200215014709.3006-4-tusharsu@linux.microsoft.com>

On Fri, 2020-02-14 at 17:47 -0800, Tushar Sugandhi wrote:
> The #define for formatting log messages, pr_fmt, is duplicated in the
> files under security/integrity.
> 
> This change moves the definition to security/integrity/integrity.h and
> removes the duplicate definitions in the other files under
> security/integrity.

A number of files under security/integrity, "pr_fmt" was not defined.
 As a result of this patch, messages in those files did change.
 Please include in this patch description a list of the updated
messages.  This includes messages in iint.c and under integrity/evm.

thanks,

Mimi

> 
> Signed-off-by: Tushar Sugandhi <tusharsu@linux.microsoft.com>
> Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> Suggested-by: Joe Perches <joe@perches.com>
> Suggested-by: Shuah Khan <skhan@linuxfoundation.org>
> ---
>  security/integrity/digsig.c                  | 2 --
>  security/integrity/digsig_asymmetric.c       | 2 --
>  security/integrity/evm/evm_crypto.c          | 2 --
>  security/integrity/evm/evm_main.c            | 2 --
>  security/integrity/evm/evm_secfs.c           | 2 --
>  security/integrity/ima/ima_asymmetric_keys.c | 2 --
>  security/integrity/ima/ima_crypto.c          | 2 --
>  security/integrity/ima/ima_fs.c              | 2 --
>  security/integrity/ima/ima_init.c            | 2 --
>  security/integrity/ima/ima_kexec.c           | 1 -
>  security/integrity/ima/ima_main.c            | 2 --
>  security/integrity/ima/ima_policy.c          | 2 --
>  security/integrity/ima/ima_queue.c           | 2 --
>  security/integrity/ima/ima_queue_keys.c      | 2 --
>  security/integrity/ima/ima_template.c        | 2 --
>  security/integrity/ima/ima_template_lib.c    | 2 --
>  security/integrity/integrity.h               | 6 ++++++
>  17 files changed, 6 insertions(+), 31 deletions(-)
> 
> diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> index ea1aae3d07b3..e9cbadade74b 100644
> --- a/security/integrity/digsig.c
> +++ b/security/integrity/digsig.c
> @@ -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>
> diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c
> index 55aec161d0e1..4e0d6778277e 100644
> --- a/security/integrity/digsig_asymmetric.c
> +++ b/security/integrity/digsig_asymmetric.c
> @@ -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>
> diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
> index d485f6fc908e..35682852ddea 100644
> --- a/security/integrity/evm/evm_crypto.c
> +++ b/security/integrity/evm/evm_crypto.c
> @@ -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>
> diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
> index f9a81b187fae..d361d7fdafc4 100644
> --- a/security/integrity/evm/evm_main.c
> +++ b/security/integrity/evm/evm_main.c
> @@ -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>
> diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c
> index c11c1f7b3ddd..39ad1038d45d 100644
> --- a/security/integrity/evm/evm_secfs.c
> +++ b/security/integrity/evm/evm_secfs.c
> @@ -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>
> diff --git a/security/integrity/ima/ima_asymmetric_keys.c b/security/integrity/ima/ima_asymmetric_keys.c
> index 7678f0e3e84d..aaae80c4e376 100644
> --- a/security/integrity/ima/ima_asymmetric_keys.c
> +++ b/security/integrity/ima/ima_asymmetric_keys.c
> @@ -9,8 +9,6 @@
>   *       create or update.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <keys/asymmetric-type.h>
>  #include "ima.h"
>  
> diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
> index 7967a6904851..423c84f95a14 100644
> --- a/security/integrity/ima/ima_crypto.c
> +++ b/security/integrity/ima/ima_crypto.c
> @@ -10,8 +10,6 @@
>   *	Calculates md5/sha1 file hash, template hash, boot-aggreate hash
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/kernel.h>
>  #include <linux/moduleparam.h>
>  #include <linux/ratelimit.h>
> diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
> index 2000e8df0301..a71e822a6e92 100644
> --- a/security/integrity/ima/ima_fs.c
> +++ b/security/integrity/ima/ima_fs.c
> @@ -12,8 +12,6 @@
>   *	current measurement list and IMA statistics
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/fcntl.h>
>  #include <linux/slab.h>
>  #include <linux/init.h>
> diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
> index 195cb4079b2b..567468188a61 100644
> --- a/security/integrity/ima/ima_init.c
> +++ b/security/integrity/ima/ima_init.c
> @@ -11,8 +11,6 @@
>   *             initialization and cleanup functions
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/init.h>
>  #include <linux/scatterlist.h>
>  #include <linux/slab.h>
> diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
> index 9e94eca48b89..121de3e04af2 100644
> --- a/security/integrity/ima/ima_kexec.c
> +++ b/security/integrity/ima/ima_kexec.c
> @@ -6,7 +6,6 @@
>   * Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
>   * Mimi Zohar <zohar@linux.vnet.ibm.com>
>   */
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
>  #include <linux/seq_file.h>
>  #include <linux/vmalloc.h>
> diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
> index aac1c44fb11b..9d0abedeae77 100644
> --- a/security/integrity/ima/ima_main.c
> +++ b/security/integrity/ima/ima_main.c
> @@ -15,8 +15,6 @@
>   *	and ima_file_check.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/module.h>
>  #include <linux/file.h>
>  #include <linux/binfmts.h>
> diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
> index 453427048999..c334e0dc6083 100644
> --- a/security/integrity/ima/ima_policy.c
> +++ b/security/integrity/ima/ima_policy.c
> @@ -7,8 +7,6 @@
>   *	- initialize default measure policy rules
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/init.h>
>  #include <linux/list.h>
>  #include <linux/fs.h>
> diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
> index 1ce8b1701566..8753212ddb18 100644
> --- a/security/integrity/ima/ima_queue.c
> +++ b/security/integrity/ima/ima_queue.c
> @@ -15,8 +15,6 @@
>   *       ever removed or changed during the boot-cycle.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/rculist.h>
>  #include <linux/slab.h>
>  #include "ima.h"
> diff --git a/security/integrity/ima/ima_queue_keys.c b/security/integrity/ima/ima_queue_keys.c
> index c87c72299191..cb3e3f501593 100644
> --- a/security/integrity/ima/ima_queue_keys.c
> +++ b/security/integrity/ima/ima_queue_keys.c
> @@ -8,8 +8,6 @@
>   *       Enables deferred processing of keys
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/workqueue.h>
>  #include <keys/asymmetric-type.h>
>  #include "ima.h"
> diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
> index 6aa6408603e3..062d9ad49afb 100644
> --- a/security/integrity/ima/ima_template.c
> +++ b/security/integrity/ima/ima_template.c
> @@ -9,8 +9,6 @@
>   *      Helpers to manage template descriptors.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include <linux/rculist.h>
>  #include "ima.h"
>  #include "ima_template_lib.h"
> diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
> index 32ae05d88257..9cd1e50f3ccc 100644
> --- a/security/integrity/ima/ima_template_lib.c
> +++ b/security/integrity/ima/ima_template_lib.c
> @@ -9,8 +9,6 @@
>   *      Library of supported template fields.
>   */
>  
> -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> -
>  #include "ima_template_lib.h"
>  
>  static bool ima_template_hash_algo_allowed(u8 algo)
> 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>


  reply	other threads:[~2020-02-16 12:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-15  1:47 [PATCH v4 0/3] IMA: improve log messages Tushar Sugandhi
2020-02-15  1:47 ` [PATCH v4 1/3] IMA: Update KBUILD_MODNAME for IMA files to ima Tushar Sugandhi
2020-02-18 19:25   ` Tushar Sugandhi
2020-02-18 19:37     ` Mimi Zohar
2020-02-15  1:47 ` [PATCH v4 2/3] IMA: Add log statements for failure conditions Tushar Sugandhi
2020-02-16 12:42   ` Mimi Zohar
2020-02-15  1:47 ` [PATCH v4 3/3] IMA: Remove duplicate pr_fmt definitions Tushar Sugandhi
2020-02-16 12:40   ` Mimi Zohar [this message]
2020-02-16 12:40 ` [PATCH v4 0/3] IMA: improve log messages Mimi Zohar
2020-02-18 19:15   ` Tushar Sugandhi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1581856851.8515.169.camel@linux.ibm.com \
    --to=zohar@linux.ibm.com \
    --cc=joe@perches.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nramas@linux.microsoft.com \
    --cc=sashal@kernel.org \
    --cc=skhan@linuxfoundation.org \
    --cc=tusharsu@linux.microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).