lkml.org 
[lkml]   [2011]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 15/20] evm: add evm_inode_post_init call in xfs
    Date
    After creating the initial LSM security extended attribute, call
    evm_inode_post_init_security() to create the 'security.evm'
    extended attribute.

    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    ---
    fs/xfs/linux-2.6/xfs_iops.c | 27 +++++++++++++++++++--------
    1 files changed, 19 insertions(+), 8 deletions(-)

    diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
    index dd21784..01b354d 100644
    --- a/fs/xfs/linux-2.6/xfs_iops.c
    +++ b/fs/xfs/linux-2.6/xfs_iops.c
    @@ -46,6 +46,7 @@
    #include <linux/namei.h>
    #include <linux/posix_acl.h>
    #include <linux/security.h>
    +#include <linux/evm.h>
    #include <linux/fiemap.h>
    #include <linux/slab.h>

    @@ -106,23 +107,33 @@ xfs_init_security(
    const struct qstr *qstr)
    {
    struct xfs_inode *ip = XFS_I(inode);
    - size_t length;
    - void *value;
    - unsigned char *name;
    + struct xattr lsm_xattr;
    + struct xattr evm_xattr;
    int error;

    - error = security_inode_init_security(inode, dir, qstr, (char **)&name,
    - &value, &length);
    + error = security_inode_init_security(inode, dir, qstr, &lsm_xattr.name,
    + &lsm_xattr.value,
    + &lsm_xattr.value_len);
    if (error) {
    if (error == -EOPNOTSUPP)
    return 0;
    return -error;
    }

    - error = xfs_attr_set(ip, name, value, length, ATTR_SECURE);
    + error = xfs_attr_set(ip, lsm_xattr.name, lsm_xattr.value,
    + lsm_xattr.value_len, ATTR_SECURE);
    + if (error)
    + goto out;

    - kfree(name);
    - kfree(value);
    + error = evm_inode_post_init_security(inode, &lsm_xattr, &evm_xattr);
    + if (error)
    + goto out;
    + error = xfs_attr_set(ip, evm_xattr.name, evm_xattr.value,
    + evm_xattr.value_len, ATTR_SECURE);
    + kfree(evm_xattr.value);
    +out:
    + kfree(lsm_xattr.name);
    + kfree(lsm_xattr.value);
    return error;
    }

    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-06-02 14:29    [W:0.020 / U:1.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site