lkml.org 
[lkml]   [2011]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 07/21] evm: evm_inode_post_removexattr
    Date
    When an EVM protected extended attribute is removed, update 'security.evm'.

    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
    ---
    fs/xattr.c | 5 ++++-
    include/linux/evm.h | 9 +++++++++
    2 files changed, 13 insertions(+), 1 deletions(-)

    diff --git a/fs/xattr.c b/fs/xattr.c
    index 6da0c8c..13814fe 100644
    --- a/fs/xattr.c
    +++ b/fs/xattr.c
    @@ -14,6 +14,7 @@
    #include <linux/mount.h>
    #include <linux/namei.h>
    #include <linux/security.h>
    +#include <linux/evm.h>
    #include <linux/syscalls.h>
    #include <linux/module.h>
    #include <linux/fsnotify.h>
    @@ -294,8 +295,10 @@ vfs_removexattr(struct dentry *dentry, const char *name)
    error = inode->i_op->removexattr(dentry, name);
    mutex_unlock(&inode->i_mutex);

    - if (!error)
    + if (!error) {
    fsnotify_xattr(dentry);
    + evm_inode_post_removexattr(dentry, name);
    + }
    return error;
    }
    EXPORT_SYMBOL_GPL(vfs_removexattr);
    diff --git a/include/linux/evm.h b/include/linux/evm.h
    index 8b4e9e3..a730782 100644
    --- a/include/linux/evm.h
    +++ b/include/linux/evm.h
    @@ -22,6 +22,8 @@ extern void evm_inode_post_setxattr(struct dentry *dentry,
    const void *xattr_value,
    size_t xattr_value_len);
    extern int evm_inode_removexattr(struct dentry *dentry, const char *xattr_name);
    +extern void evm_inode_post_removexattr(struct dentry *dentry,
    + const char *xattr_name);
    #else
    #ifdef CONFIG_INTEGRITY
    static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
    @@ -52,5 +54,12 @@ static inline int evm_inode_removexattr(struct dentry *dentry,
    {
    return 0;
    }
    +
    +static inline void evm_inode_post_removexattr(struct dentry *dentry,
    + const char *xattr_name)
    +{
    + return;
    +}
    +
    #endif /* CONFIG_EVM_H */
    #endif /* LINUX_EVM_H */
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-05-16 16:49    [W:0.025 / U:31.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site