summaryrefslogtreecommitdiff
path: root/security/security.c
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2011-05-13 12:53:38 -0400
committerMimi Zohar <zohar@linux.vnet.ibm.com>2011-07-18 12:29:50 -0400
commit817b54aa45db03437c6d09a7693fc6926eb8e822 (patch)
tree03d43f3abfbd8670e3a30a33ef868ec7705ef2c4 /security/security.c
parent7102ebcd65c1cdb5d5a87c7c5cf7a46f5afb0cac (diff)
downloadlinux-3.10-817b54aa45db03437c6d09a7693fc6926eb8e822.tar.gz
linux-3.10-817b54aa45db03437c6d09a7693fc6926eb8e822.tar.bz2
linux-3.10-817b54aa45db03437c6d09a7693fc6926eb8e822.zip
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>
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c
index 181990ae90c..19251ccb2de 100644
--- a/security/security.c
+++ b/security/security.c
@@ -571,9 +571,14 @@ int security_inode_exec_permission(struct inode *inode, unsigned int flags)
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);