Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next

As requested by Mimi, this adds the IMA Appraisal feature.

1 files changed, 6 insertions, 0 deletions

diff --git a/security/security.c b/security/security.c
index 68c1b9b45d93..d23b43522a5a 100644
--- a/security/security.c
+++ b/security/security.c
@@ -573,6 +573,9 @@ int security_inode_setxattr(struct dentry *dentry, const char *name,
         ret = security_ops->inode_setxattr(dentry, name, value, size, flags);
         if (ret)
                 return ret;
+        ret = ima_inode_setxattr(dentry, name, value, size);
+        if (ret)
+                return ret;
         return evm_inode_setxattr(dentry, name, value, size);
 }
 
@@ -608,6 +611,9 @@ int security_inode_removexattr(struct dentry *dentry, const char *name)
         ret = security_ops->inode_removexattr(dentry, name);
         if (ret)
                 return ret;
+        ret = ima_inode_removexattr(dentry, name);
+        if (ret)
+                return ret;
         return evm_inode_removexattr(dentry, name);
 }