alex/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ima: Align ima_inode_setxattr() definition with LSM infrastructure

Browse Source 
Change ima_inode_setxattr() definition, so that it can be registered as
implementation of the inode_setxattr hook.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Roberto Sassu 2024-02-15 11:30:51 +01:00 committed by Paul Moore
parent 0298c5a9b1
commit fbd0506e5c
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/ima.h
View File

@ -188,8 +188,9 @@ static inline void ima_post_key_create_or_update(struct key *keyring,
extern bool is_ima_appraise_enabled(void); extern bool is_ima_appraise_enabled(void);
extern void ima_inode_post_setattr(struct mnt_idmap *idmap, extern void ima_inode_post_setattr(struct mnt_idmap *idmap,
struct dentry *dentry, int ia_valid); struct dentry *dentry, int ia_valid);
extern int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name, extern int ima_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
const void *xattr_value, size_t xattr_value_len); const char *xattr_name, const void *xattr_value,
size_t xattr_value_len, int flags);
extern int ima_inode_set_acl(struct mnt_idmap *idmap, extern int ima_inode_set_acl(struct mnt_idmap *idmap,
struct dentry *dentry, const char *acl_name, struct dentry *dentry, const char *acl_name,
struct posix_acl *kacl); struct posix_acl *kacl);
@ -212,10 +213,12 @@ static inline void ima_inode_post_setattr(struct mnt_idmap *idmap,
return; return;
} }
static inline int ima_inode_setxattr(struct dentry *dentry, static inline int ima_inode_setxattr(struct mnt_idmap *idmap,
struct dentry *dentry,
const char *xattr_name, const char *xattr_name,
const void *xattr_value, const void *xattr_value,
size_t xattr_value_len) size_t xattr_value_len,
int flags)
{ {
return 0; return 0;
} }

5
security/integrity/ima/ima_appraise.c
View File

@ -750,8 +750,9 @@ static int validate_hash_algo(struct dentry *dentry,
return -EACCES; return -EACCES;
} }
int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name, int ima_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
const void *xattr_value, size_t xattr_value_len) const char *xattr_name, const void *xattr_value,
size_t xattr_value_len, int flags)
{ {
const struct evm_ima_xattr_data *xvalue = xattr_value; const struct evm_ima_xattr_data *xvalue = xattr_value;
int digsig = 0; int digsig = 0;

2
security/security.c
View File

@ -2269,7 +2269,7 @@ int security_inode_setxattr(struct mnt_idmap *idmap,
ret = cap_inode_setxattr(dentry, name, value, size, flags); ret = cap_inode_setxattr(dentry, name, value, size, flags);
if (ret) if (ret)
return ret; return ret;
ret = ima_inode_setxattr(dentry, name, value, size); 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);