IMA: include the word IMA in printk messages

As an example IMA emits a warning when it can't find a TPM chip:

"No TPM chip found, activating TPM-bypass!"

This patch prefaces that message with IMA so we know what subsystem is
bypassing the TPM.  Do this for all pr_info and pr_err messages.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>

3 files changed, 5 insertions, 5 deletions

diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index 46642a19bc7..acd4226f73e 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -26,7 +26,7 @@ static int init_desc(struct hash_desc *desc)
 
         desc->tfm = crypto_alloc_hash(ima_hash, 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(desc->tfm)) {
-                pr_info("failed to load %s transform: %ld\n",
+                pr_info("IMA: failed to load %s transform: %ld\n",
                         ima_hash, PTR_ERR(desc->tfm));
                 rc = PTR_ERR(desc->tfm);
                 return rc;
@@ -111,7 +111,7 @@ static void __init ima_pcrread(int idx, u8 *pcr)
                 return;
 
         if (tpm_pcr_read(TPM_ANY_NUM, idx, pcr) != 0)
-                pr_err("Error Communicating to TPM chip\n");
+                pr_err("IMA: Error Communicating to TPM chip\n");
 }
 
 /*
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index a40da7ae590..b93eddc589e 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -82,7 +82,7 @@ int __init ima_init(void)
                 ima_used_chip = 1;
 
         if (!ima_used_chip)
-                pr_info("No TPM chip found, activating TPM-bypass!\n");
+                pr_info("IMA: No TPM chip found, activating TPM-bypass!\n");
 
         ima_add_boot_aggregate();       /* boot aggregate must be first entry */
         ima_init_policy();
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
index a0880e9c8e0..148a3d85e77 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -70,7 +70,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
 
         qe = kmalloc(sizeof(*qe), GFP_KERNEL);
         if (qe == NULL) {
-                pr_err("OUT OF MEMORY ERROR creating queue entry.\n");
+                pr_err("IMA: OUT OF MEMORY ERROR creating queue entry.\n");
                 return -ENOMEM;
         }
         qe->entry = entry;
@@ -93,7 +93,7 @@ static int ima_pcr_extend(const u8 *hash)
 
         result = tpm_pcr_extend(TPM_ANY_NUM, CONFIG_IMA_MEASURE_PCR_IDX, hash);
         if (result != 0)
-                pr_err("Error Communicating to TPM chip\n");
+                pr_err("IMA: Error Communicating to TPM chip\n");
         return result;
 }