Merge tag 'integrity-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[linux-2.6-microblaze.git] / security / integrity / ima / ima_policy.c

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 99d23ac..eea6e92 100644 (file)
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -428,7 +428,7 @@ static int ima_lsm_update_rule(struct ima_rule_entry *entry)
        /*
         * ima_lsm_copy_rule() shallow copied all references, except for the
         * LSM references, from entry to nentry so we only want to free the LSM
-        * references and the entry itself. All other memory refrences will now
+        * references and the entry itself. All other memory references will now
         * be owned by nentry.
         */
        ima_lsm_free_rule(entry);
@@ -711,7 +711,7 @@ int ima_match_policy(struct user_namespace *mnt_userns, struct inode *inode,
                                     func, mask, func_data))
                        continue;
 
-               action |= entry->flags & IMA_ACTION_FLAGS;
+               action |= entry->flags & IMA_NONACTION_FLAGS;
 
                action |= entry->action & IMA_DO_MASK;
                if (entry->action & IMA_APPRAISE) {