diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-08-11 00:22:51 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-08-11 03:42:07 -0400 |
commit | e1c9b23adbe86c725738402857397d7a29f9d6ef (patch) | |
tree | 746d85cd4518480507c7d01b4c25d39d4ef21805 /include/linux/security.h | |
parent | 0b024d2446474c6a7c47573af5a35db83f557ce3 (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>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 7 |
1 files changed, 7 insertions, 0 deletions
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, | |||
2048 | return -EOPNOTSUPP; | 2048 | return -EOPNOTSUPP; |
2049 | } | 2049 | } |
2050 | 2050 | ||
2051 | int security_old_inode_init_security(struct inode *inode, struct inode *dir, | ||
2052 | const struct qstr *qstr, char **name, | ||
2053 | void **value, size_t *len) | ||
2054 | { | ||
2055 | return -EOPNOTSUPP; | ||
2056 | } | ||
2057 | |||
2051 | static inline int security_inode_create(struct inode *dir, | 2058 | static inline int security_inode_create(struct inode *dir, |
2052 | struct dentry *dentry, | 2059 | struct dentry *dentry, |
2053 | int mode) | 2060 | int mode) |