commit 817b54aa45db03437c6d09a7693fc6926eb8e822
author Mimi Zohar <zohar@linux.vnet.ibm.com> Fri May 13 12:53:38 2011 -0400
committer Mimi Zohar <zohar@linux.vnet.ibm.com> Mon Jul 18 12:29:50 2011 -0400
tree 03d43f3abfbd8670e3a30a33ef868ec7705ef2c4
parent 7102ebcd65c1cdb5d5a87c7c5cf7a46f5afb0cac

evm: add evm_inode_setattr to prevent updating an invalid security.evm

Permit changing of security.evm only when valid, unless in fixmode.

Reported-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>

security/security.c

diff --git a/security/security.c b/security/security.c
index 181990a..19251cc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -571,9 +571,14 @@
 
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
 {
+	int ret;
+
 	if (unlikely(IS_PRIVATE(dentry->d_inode)))
 		return 0;
-	return security_ops->inode_setattr(dentry, attr);
+	ret = security_ops->inode_setattr(dentry, attr);
+	if (ret)
+		return ret;
+	return evm_inode_setattr(dentry, attr);
 }
 EXPORT_SYMBOL_GPL(security_inode_setattr);