1 files changed, 10 insertions, 10 deletions

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index c38bbce8c6a6..ba9e4d792dd5 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 {
@@ -132,7 +132,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
                        const char *op, const char *cause)
 {
         struct ima_template_entry *entry;
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int violation = 1;
         int result;
 
@@ -160,10 +160,10 @@ err_out:
  * @function: calling function (FILE_CHECK, BPRM_CHECK, MMAP_CHECK, MODULE_CHECK)
  *
  * The policy is defined in terms of keypairs:
- *              subj=, obj=, type=, func=, mask=, fsmagic=
+ *              subj=, obj=, type=, func=, mask=, fsmagic=
  *      subj,obj, and type: are LSM specific.
- *      func: FILE_CHECK | BPRM_CHECK | MMAP_CHECK | MODULE_CHECK
- *      mask: contains the permission mask
+ *      func: FILE_CHECK | BPRM_CHECK | MMAP_CHECK | MODULE_CHECK
+ *      mask: contains the permission mask
  *      fsmagic: hex value
  *
  * Returns IMA_MEASURE, IMA_APPRAISE mask.
@@ -248,7 +248,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,
  *
  * We only get here if the inode has not already been measured,
  * but the measurement could already exist:
- *      - multiple copies of the same file on either the same or
+ *      - multiple copies of the same file on either the same or
  *        different filesystems.
  *      - the inode was previously flushed as well as the iint info,
  *        containing the hashing info.
@@ -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;
@@ -332,5 +332,5 @@ const char *ima_d_path(struct path *path, char **pathbuf)
                         pathname = NULL;
                 }
         }
-        return pathname;
+        return pathname ?: (const char *)path->dentry->d_name.name;
 }