Commit 5a4730ba authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

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: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent e1c9b23a

include/linux/evm.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

security/integrity/evm/evm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)