lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evm: fix evm_inode_init_security return code

Browse Source 
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>
This commit is contained in:
Mimi Zohar
2011-08-11 00:22:52 -04:00
committed by James Morris
parent e1c9b23adb
commit 5a4730ba95
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/evm.h
View File

@@ -85,7 +85,7 @@ static inline int evm_inode_init_security(struct inode *inode,
const struct xattr *xattr_array, const struct xattr *xattr_array,
struct xattr *evm) struct xattr *evm)
{ {
return -EOPNOTSUPP; return 0;
} }
#endif /* CONFIG_EVM_H */ #endif /* CONFIG_EVM_H */

2
security/integrity/evm/evm_main.c
View File

@@ -324,7 +324,7 @@ int evm_inode_init_security(struct inode *inode,
int rc; int rc;
if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name)) if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name))
return -EOPNOTSUPP; return 0;
xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS); xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS);
if (!xattr_data) if (!xattr_data)