Commit e1c9b23a authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

evm: building without EVM enabled fixes 



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

- Missing security_old_inode_init_security() stub function definition.
Caused by commit 9d8f13ba ("security: new security_inode_init_security
API adds function callback").

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 0b024d24

include/linux/evm.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

include/linux/security.h

+7 −0
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE