3 files changed, 7 insertions, 3 deletions

diff --git a/fs/attr.c b/fs/attr.c
index 29e38a1f7f77..cce7df53b694 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -14,6 +14,7 @@
 #include <linux/fcntl.h>
 #include <linux/security.h>
 #include <linux/evm.h>
+#include <linux/ima.h>
 
 /**
  * inode_change_ok - check if attribute changes to an inode are allowed
@@ -247,6 +248,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
 
         if (!error) {
                 fsnotify_change(dentry, ia_valid);
+                ima_inode_post_setattr(dentry);
                 evm_inode_post_setattr(dentry, ia_valid);
         }
 
diff --git a/fs/file_table.c b/fs/file_table.c
index c6780163bf3e..dac67923330f 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -243,10 +243,10 @@ static void __fput(struct file *file)
                 if (file->f_op && file->f_op->fasync)
                         file->f_op->fasync(-1, file, 0);
         }
+        ima_file_free(file);
         if (file->f_op && file->f_op->release)
                 file->f_op->release(inode, file);
         security_file_free(file);
-        ima_file_free(file);
         if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL &&
                      !(file->f_mode & FMODE_PATH))) {
                 cdev_put(inode->i_cdev);
diff --git a/fs/xattr.c b/fs/xattr.c
index ca15fbd391c8..1780f062dbaf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -296,11 +296,13 @@ vfs_removexattr(struct dentry *dentry, const char *name)
         if (error)
                 return error;
 
+        mutex_lock(&inode->i_mutex);
         error = security_inode_removexattr(dentry, name);
-        if (error)
+        if (error) {
+                mutex_unlock(&inode->i_mutex);
                 return error;
+        }
 
-        mutex_lock(&inode->i_mutex);
         error = inode->i_op->removexattr(dentry, name);
         mutex_unlock(&inode->i_mutex);