Kaynağa Gözat

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>
Mimi Zohar 14 yıl önce
ebeveyn
işleme
5a4730ba95
2 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 1 1
      include/linux/evm.h
  2. 1 1
      security/integrity/evm/evm_main.c

+ 1 - 1
include/linux/evm.h

@@ -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 */

+ 1 - 1
security/integrity/evm/evm_main.c

@@ -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)