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 <[email protected]>
Signed-off-by: James Morris <[email protected]>

diff --git a/include/linux/evm.h b/include/linux/evm.h
index 62deb6557d37f4beb5052933b0c48f65f413809d..ea603c9e775df3426b28afc4ca3c76f726914ce0 100644 (file)
--- a/include/linux/evm.h
+++ b/include/linux/evm.h
@@ -85,7 +85,7 @@ static inline int evm_inode_init_security(struct inode *inode,
                                          const struct xattr *xattr_array,
                                          struct xattr *evm)
 {
-       return -EOPNOTSUPP;
+       return 0;
 }
 
 #endif /* CONFIG_EVM_H */

diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index 8fc5b5d7ceaaa77097b0cf5f14a86880ba0961c3..f0127e536f849ad7bee146d3b350ba8d0ead4dc0 100644 (file)
--- 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,
        int rc;
 
        if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name))
-               return -EOPNOTSUPP;
+               return 0;
 
        xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS);
        if (!xattr_data)