ima: use static const char array definitions

A const char pointer allocates memory for a pointer as well as for
a string,  This patch replaces a number of the const char pointers
throughout IMA, with a static const char array.

Suggested-by: David Howells <dhowells@redhat.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 6d76d4a01503..393b9d46c472 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -92,8 +92,8 @@ int ima_store_template(struct ima_template_entry *entry,
                        int violation, struct inode *inode,
                        const unsigned char *filename)
 {
-        const char *op = "add_template_measure";
-        const char *audit_cause = "hashing_error";
+        static const char op[] = "add_template_measure";
+        static const char audit_cause[] = "hashing_error";
         char *template_name = entry->template_desc->name;
         int result;
         struct {
@@ -260,8 +260,8 @@ void ima_store_measurement(struct integrity_iint_cache *iint,
                            struct evm_ima_xattr_data *xattr_value,
                            int xattr_len)
 {
-        const char *op = "add_template_measure";
-        const char *audit_cause = "ENOMEM";
+        static const char op[] = "add_template_measure";
+        static const char audit_cause[] = "ENOMEM";
         int result = -ENOMEM;
         struct inode *inode = file_inode(file);
         struct ima_template_entry *entry;
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 734e9468aca0..291bf0f3a46d 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -177,11 +177,11 @@ int ima_appraise_measurement(int func, struct integrity_iint_cache *iint,
                              struct evm_ima_xattr_data *xattr_value,
                              int xattr_len)
 {
+        static const char op[] = "appraise_data";
+        char *cause = "unknown";
         struct dentry *dentry = file->f_dentry;
         struct inode *inode = dentry->d_inode;
         enum integrity_status status = INTEGRITY_UNKNOWN;
-        const char *op = "appraise_data";
-        char *cause = "unknown";
         int rc = xattr_len, hash_start = 0;
 
         if (!ima_appraise)
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index 37122768554a..315f2b96496f 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -42,10 +42,10 @@ int ima_used_chip;
  */
 static void __init ima_add_boot_aggregate(void)
 {
+        static const char op[] = "add_boot_aggregate";
+        const char *audit_cause = "ENOMEM";
         struct ima_template_entry *entry;
         struct integrity_iint_cache tmp_iint, *iint = &tmp_iint;
-        const char *op = "add_boot_aggregate";
-        const char *audit_cause = "ENOMEM";
         int result = -ENOMEM;
         int violation = 0;
         struct {
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 354b125c6c9f..3f6b8a466368 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -329,7 +329,7 @@ void __init ima_init_policy(void)
  */
 void ima_update_policy(void)
 {
-        const char *op = "policy_update";
+        static const char op[] = "policy_update";
         const char *cause = "already exists";
         int result = 1;
         int audit_info = 0;
@@ -645,7 +645,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
  */
 ssize_t ima_parse_add_rule(char *rule)
 {
-        const char *op = "update_policy";
+        static const char op[] = "update_policy";
         char *p;
         struct ima_rule_entry *entry;
         ssize_t result, len;