From ffc6f8ba4762a2ee141bbb1a7b3d02fa4ec47fb3 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Thu, 11 Aug 2011 00:22:52 -0400 Subject: [PATCH] --- yaml --- r: 264496 b: refs/heads/master c: 5a4730ba9517cf2793175991243436a24b1db18f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/evm.h | 2 +- trunk/security/integrity/evm/evm_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 64b61c472aaf..7aaa65da83b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1c9b23adbe86c725738402857397d7a29f9d6ef +refs/heads/master: 5a4730ba9517cf2793175991243436a24b1db18f diff --git a/trunk/include/linux/evm.h b/trunk/include/linux/evm.h index 62deb6557d37..ea603c9e775d 100644 --- a/trunk/include/linux/evm.h +++ b/trunk/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/trunk/security/integrity/evm/evm_main.c b/trunk/security/integrity/evm/evm_main.c index 8fc5b5d7ceaa..f0127e536f84 100644 --- a/trunk/security/integrity/evm/evm_main.c +++ b/trunk/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)