openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

evm: building without EVM enabled fixes 

- Missing 'inline' on evm_inode_setattr() definition.
Introduced by commit 817b54aa45 ("evm: add evm_inode_setattr to prevent
updating an invalid security.evm").

- Missing security_old_inode_init_security() stub function definition.
Caused by commit 9d8f13ba3f ("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>
This commit is contained in:
Mimi Zohar 2011-08-11 00:22:51 -04:00 committed by James Morris
parent 0b024d2446
commit e1c9b23adb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/evm.h
View File

@ -45,7 +45,7 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
} }
#endif #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; return 0;
} }

7
include/linux/security.h
View File

@ -2048,6 +2048,13 @@ static inline int security_inode_init_security(struct inode *inode,
return -EOPNOTSUPP; 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, static inline int security_inode_create(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
int mode) int mode)