Commit 784111d0 authored by Roberto Sassu's avatar Roberto Sassu Committed by Paul Moore

evm: Align evm_inode_post_setattr() definition with LSM infrastructure

Change evm_inode_post_setattr() definition, so that it can be registered as
implementation of the inode_post_setattr hook (to be introduced).
Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Acked-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent fec5f85e
...@@ -503,7 +503,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry, ...@@ -503,7 +503,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
if (!error) { if (!error) {
fsnotify_change(dentry, ia_valid); fsnotify_change(dentry, ia_valid);
ima_inode_post_setattr(idmap, dentry, ia_valid); ima_inode_post_setattr(idmap, dentry, ia_valid);
evm_inode_post_setattr(dentry, ia_valid); evm_inode_post_setattr(idmap, dentry, ia_valid);
} }
return error; return error;
......
...@@ -23,7 +23,8 @@ extern enum integrity_status evm_verifyxattr(struct dentry *dentry, ...@@ -23,7 +23,8 @@ extern enum integrity_status evm_verifyxattr(struct dentry *dentry,
struct integrity_iint_cache *iint); struct integrity_iint_cache *iint);
extern int evm_inode_setattr(struct mnt_idmap *idmap, extern int evm_inode_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, struct iattr *attr); struct dentry *dentry, struct iattr *attr);
extern void evm_inode_post_setattr(struct dentry *dentry, int ia_valid); extern void evm_inode_post_setattr(struct mnt_idmap *idmap,
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);
...@@ -98,7 +99,8 @@ static inline int evm_inode_setattr(struct mnt_idmap *idmap, ...@@ -98,7 +99,8 @@ static inline int evm_inode_setattr(struct mnt_idmap *idmap,
return 0; return 0;
} }
static inline void evm_inode_post_setattr(struct dentry *dentry, int ia_valid) static inline void evm_inode_post_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, int ia_valid)
{ {
return; return;
} }
......
...@@ -870,6 +870,7 @@ int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry, ...@@ -870,6 +870,7 @@ int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
/** /**
* evm_inode_post_setattr - update 'security.evm' after modifying metadata * evm_inode_post_setattr - update 'security.evm' after modifying metadata
* @idmap: idmap of the idmapped mount
* @dentry: pointer to the affected dentry * @dentry: pointer to the affected dentry
* @ia_valid: for the UID and GID status * @ia_valid: for the UID and GID status
* *
...@@ -879,7 +880,8 @@ int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry, ...@@ -879,7 +880,8 @@ int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
* This function is called from notify_change(), which expects the caller * This function is called from notify_change(), which expects the caller
* to lock the inode's i_mutex. * to lock the inode's i_mutex.
*/ */
void evm_inode_post_setattr(struct dentry *dentry, int ia_valid) void evm_inode_post_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
int ia_valid)
{ {
if (!evm_revalidate_status(NULL)) if (!evm_revalidate_status(NULL))
return; return;
......
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