summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2011-08-11 00:22:51 -0400
committerJames Morris <jmorris@namei.org>2011-08-11 17:42:07 +1000
commite1c9b23adbe86c725738402857397d7a29f9d6ef (patch)
tree746d85cd4518480507c7d01b4c25d39d4ef21805
parent0b024d2446474c6a7c47573af5a35db83f557ce3 (diff)
evm: building without EVM enabled fixes
- Missing 'inline' on evm_inode_setattr() definition. Introduced by commit 817b54aa45db ("evm: add evm_inode_setattr to prevent updating an invalid security.evm"). - Missing security_old_inode_init_security() stub function definition. Caused by commit 9d8f13ba3f48 ("security: new security_inode_init_security API adds function callback"). Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/evm.h2
-rw-r--r--include/linux/security.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/evm.h b/include/linux/evm.h
index db5556dcdd27..62deb6557d37 100644
--- a/include/linux/evm.h
+++ b/include/linux/evm.h
@@ -45,7 +45,7 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
}
#endif
-static int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
+static inline int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
return 0;
}
diff --git a/include/linux/security.h b/include/linux/security.h
index 1c528b19a329..f399cf10e2a8 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2048,6 +2048,13 @@ static inline int security_inode_init_security(struct inode *inode,
return -EOPNOTSUPP;
}
+int security_old_inode_init_security(struct inode *inode, struct inode *dir,
+ const struct qstr *qstr, char **name,
+ void **value, size_t *len)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int security_inode_create(struct inode *dir,
struct dentry *dentry,
int mode)