From 09c0596321fefa63a34c591634e7cdee3c80622b Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Wed, 9 Mar 2011 14:39:57 -0500
Subject: [PATCH] --- yaml --- r: 264484 b: refs/heads/master c:
 975d294373d8c1c913ad2bf4eb93966d4c7ca38f h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/attr.c           | 5 ++++-
 trunk/include/linux/evm.h | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dad48f8f131c..a69cffacbd27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b87de23b6fd5dfbe5c36601f29d6c515056343
+refs/heads/master: 975d294373d8c1c913ad2bf4eb93966d4c7ca38f
diff --git a/trunk/fs/attr.c b/trunk/fs/attr.c
index caf2aa521e2b..5ad45d3cc20a 100644
--- a/trunk/fs/attr.c
+++ b/trunk/fs/attr.c
@@ -13,6 +13,7 @@
 #include <linux/fsnotify.h>
 #include <linux/fcntl.h>
 #include <linux/security.h>
+#include <linux/evm.h>
 
 /**
  * inode_change_ok - check if attribute changes to an inode are allowed
@@ -243,8 +244,10 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
 	if (ia_valid & ATTR_SIZE)
 		up_write(&dentry->d_inode->i_alloc_sem);
 
-	if (!error)
+	if (!error) {
 		fsnotify_change(dentry, ia_valid);
+		evm_inode_post_setattr(dentry, ia_valid);
+	}
 
 	return error;
 }
diff --git a/trunk/include/linux/evm.h b/trunk/include/linux/evm.h
index a730782da563..33a92471e463 100644
--- a/trunk/include/linux/evm.h
+++ b/trunk/include/linux/evm.h
@@ -15,6 +15,7 @@ extern enum integrity_status evm_verifyxattr(struct dentry *dentry,
 					     const char *xattr_name,
 					     void *xattr_value,
 					     size_t xattr_value_len);
+extern void evm_inode_post_setattr(struct dentry *dentry, int ia_valid);
 extern int evm_inode_setxattr(struct dentry *dentry, const char *name,
 			      const void *value, size_t size);
 extern void evm_inode_post_setxattr(struct dentry *dentry,
@@ -35,6 +36,11 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
 }
 #endif
 
+static inline void evm_inode_post_setattr(struct dentry *dentry, int ia_valid)
+{
+	return;
+}
+
 static inline int evm_inode_setxattr(struct dentry *dentry, const char *name,
 				     const void *value, size_t size)
 {