summaryrefslogtreecommitdiffstats
path: root/security/integrity/evm
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/integrity/evm
parent7102ebcd65c1cdb5d5a87c7c5cf7a46f5afb0cac (diff)
downloadlinux-stable-817b54aa45db03437c6d09a7693fc6926eb8e822.tar.gz
linux-stable-817b54aa45db03437c6d09a7693fc6926eb8e822.tar.bz2
linux-stable-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/integrity/evm')
-rw-r--r--security/integrity/evm/evm_main.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index 94d66af07aa4..8fc5b5d7ceaa 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -278,6 +278,21 @@ void evm_inode_post_removexattr(struct dentry *dentry, const char *xattr_name)
}
/**
+ * evm_inode_setattr - prevent updating an invalid EVM extended attribute
+ * @dentry: pointer to the affected dentry
+ */
+int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
+{
+ unsigned int ia_valid = attr->ia_valid;
+ enum integrity_status evm_status;
+
+ if (ia_valid & ~(ATTR_MODE | ATTR_UID | ATTR_GID))
+ return 0;
+ evm_status = evm_verify_current_integrity(dentry);
+ return evm_status == INTEGRITY_PASS ? 0 : -EPERM;
+}
+
+/**
* evm_inode_post_setattr - update 'security.evm' after modifying metadata
* @dentry: pointer to the affected dentry
* @ia_valid: for the UID and GID status