Commit 2b6a4054 authored by Roberto Sassu's avatar Roberto Sassu Committed by Paul Moore

evm: Align evm_inode_setxattr() definition with LSM infrastructure

Change evm_inode_setxattr() definition, so that it can be registered as
implementation of the inode_setxattr hook.
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Reviewed-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Acked-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 784111d0
...@@ -27,7 +27,7 @@ extern void evm_inode_post_setattr(struct mnt_idmap *idmap, ...@@ -27,7 +27,7 @@ extern void evm_inode_post_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, int ia_valid); struct dentry *dentry, int ia_valid);
extern int evm_inode_setxattr(struct mnt_idmap *idmap, extern int evm_inode_setxattr(struct mnt_idmap *idmap,
struct dentry *dentry, const char *name, struct dentry *dentry, const char *name,
const void *value, size_t size); const void *value, size_t size, int flags);
extern void evm_inode_post_setxattr(struct dentry *dentry, extern void evm_inode_post_setxattr(struct dentry *dentry,
const char *xattr_name, const char *xattr_name,
const void *xattr_value, const void *xattr_value,
...@@ -107,7 +107,7 @@ static inline void evm_inode_post_setattr(struct mnt_idmap *idmap, ...@@ -107,7 +107,7 @@ static inline void evm_inode_post_setattr(struct mnt_idmap *idmap,
static inline int evm_inode_setxattr(struct mnt_idmap *idmap, static inline int evm_inode_setxattr(struct mnt_idmap *idmap,
struct dentry *dentry, const char *name, struct dentry *dentry, const char *name,
const void *value, size_t size) const void *value, size_t size, int flags)
{ {
return 0; return 0;
} }
......
...@@ -581,6 +581,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap, ...@@ -581,6 +581,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap,
* @xattr_name: pointer to the affected extended attribute name * @xattr_name: pointer to the affected extended attribute name
* @xattr_value: pointer to the new extended attribute value * @xattr_value: pointer to the new extended attribute value
* @xattr_value_len: pointer to the new extended attribute value length * @xattr_value_len: pointer to the new extended attribute value length
* @flags: flags to pass into filesystem operations
* *
* Before allowing the 'security.evm' protected xattr to be updated, * Before allowing the 'security.evm' protected xattr to be updated,
* verify the existing value is valid. As only the kernel should have * verify the existing value is valid. As only the kernel should have
...@@ -590,7 +591,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap, ...@@ -590,7 +591,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap,
*/ */
int evm_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry, int evm_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
const char *xattr_name, const void *xattr_value, const char *xattr_name, const void *xattr_value,
size_t xattr_value_len) size_t xattr_value_len, int flags)
{ {
const struct evm_ima_xattr_data *xattr_data = xattr_value; const struct evm_ima_xattr_data *xattr_data = xattr_value;
......
...@@ -2272,7 +2272,7 @@ int security_inode_setxattr(struct mnt_idmap *idmap, ...@@ -2272,7 +2272,7 @@ int security_inode_setxattr(struct mnt_idmap *idmap,
ret = ima_inode_setxattr(idmap, dentry, name, value, size, flags); ret = ima_inode_setxattr(idmap, dentry, name, value, size, flags);
if (ret) if (ret)
return ret; return ret;
return evm_inode_setxattr(idmap, dentry, name, value, size); return evm_inode_setxattr(idmap, dentry, name, value, size, flags);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment