diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-08-11 00:22:52 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-08-11 03:42:41 -0400 |
commit | 5a4730ba9517cf2793175991243436a24b1db18f (patch) | |
tree | 2c9c26d4662a31c851aed525d4d032d08e54e297 /security/integrity/evm | |
parent | e1c9b23adbe86c725738402857397d7a29f9d6ef (diff) |
evm: fix evm_inode_init_security return code
evm_inode_init_security() should return 0, when EVM is not enabled.
(Returning an error is a remnant of evm_inode_post_init_security.)
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity/evm')
-rw-r--r-- | security/integrity/evm/evm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 8fc5b5d7ceaa..f0127e536f84 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c | |||
@@ -324,7 +324,7 @@ int evm_inode_init_security(struct inode *inode, | |||
324 | int rc; | 324 | int rc; |
325 | 325 | ||
326 | if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name)) | 326 | if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name)) |
327 | return -EOPNOTSUPP; | 327 | return 0; |
328 | 328 | ||
329 | xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS); | 329 | xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS); |
330 | if (!xattr_data) | 330 | if (!xattr_data) |