lkml.org 
[lkml]   [2023]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/28] ima: Align ima_inode_setxattr() definition with LSM infrastructure
    Date
    From: Roberto Sassu <roberto.sassu@huawei.com>

    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>
    ---
    include/linux/ima.h | 11 +++++++----
    security/integrity/ima/ima_appraise.c | 5 +++--
    security/security.c | 2 +-
    3 files changed, 11 insertions(+), 7 deletions(-)

    diff --git a/include/linux/ima.h b/include/linux/ima.h
    index dd216afab6c..6ec6725e3ad 100644
    --- a/include/linux/ima.h
    +++ b/include/linux/ima.h
    @@ -194,8 +194,9 @@ static inline void ima_post_key_create_or_update(struct key *keyring,
    extern bool is_ima_appraise_enabled(void);
    extern void ima_inode_post_setattr(struct mnt_idmap *idmap,
    struct dentry *dentry, int ia_valid);
    -extern int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name,
    - const void *xattr_value, size_t xattr_value_len);
    +extern int ima_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
    + 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,
    struct dentry *dentry, const char *acl_name,
    struct posix_acl *kacl);
    @@ -218,10 +219,12 @@ static inline void ima_inode_post_setattr(struct mnt_idmap *idmap,
    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 void *xattr_value,
    - size_t xattr_value_len)
    + size_t xattr_value_len,
    + int flags)
    {
    return 0;
    }
    diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
    index 6b032bce4fe..88c5a0b2992 100644
    --- a/security/integrity/ima/ima_appraise.c
    +++ b/security/integrity/ima/ima_appraise.c
    @@ -748,8 +748,9 @@ static int validate_hash_algo(struct dentry *dentry,
    return -EACCES;
    }

    -int ima_inode_setxattr(struct dentry *dentry, const char *xattr_name,
    - const void *xattr_value, size_t xattr_value_len)
    +int ima_inode_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,
    + const char *xattr_name, const void *xattr_value,
    + size_t xattr_value_len, int flags)
    {
    const struct evm_ima_xattr_data *xvalue = xattr_value;
    int digsig = 0;
    diff --git a/security/security.c b/security/security.c
    index 8d31b739879..51612dcf05b 100644
    --- a/security/security.c
    +++ b/security/security.c
    @@ -2221,7 +2221,7 @@ int security_inode_setxattr(struct mnt_idmap *idmap,
    ret = cap_inode_setxattr(dentry, name, value, size, flags);
    if (ret)
    return ret;
    - ret = ima_inode_setxattr(dentry, name, value, size);
    + ret = ima_inode_setxattr(idmap, dentry, name, value, size, flags);
    if (ret)
    return ret;
    return evm_inode_setxattr(idmap, dentry, name, value, size);
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-03-27 00:43    [W:3.868 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site