From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Wed, 23 Mar 2011 21:23:06 +0000 (-0400)
Subject: vfs: extend vfs_removexattr locking
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ab51f3721f7abdf92d89cb79d3d6c0062ddc14b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

vfs: extend vfs_removexattr locking

This patch takes the i_mutex lock before security_inode_removexattr(),
instead of after, in preparation of calling ima_inode_removexattr().

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
---

diff --git a/fs/xattr.c b/fs/xattr.c
index 4d45b7189e7e..107f457143c3 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -295,11 +295,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);