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 13/20] evm: add evm_inode_post_init call in jffs2
    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/jffs2/security.c | 26 +++++++++++++++++++-------
    1 files changed, 19 insertions(+), 7 deletions(-)

    diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c
    index cfeb716..6847769 100644
    --- a/fs/jffs2/security.c
    +++ b/fs/jffs2/security.c
    @@ -20,6 +20,7 @@
    #include <linux/xattr.h>
    #include <linux/mtd/mtd.h>
    #include <linux/security.h>
    +#include <linux/evm.h>
    #include "nodelist.h"

    /* ---- Initial Security Label Attachment -------------- */
    @@ -28,19 +29,30 @@ int jffs2_init_security(struct inode *inode, struct inode *dir,
    {
    int rc;
    size_t len;
    - void *value;
    - char *name;
    + struct xattr lsm_xattr;
    + struct xattr evm_xattr;

    - rc = security_inode_init_security(inode, dir, qstr, &name, &value, &len);
    + rc = security_inode_init_security(inode, dir, qstr, &lsm_xattr.name,
    + &lsm_xattr.value,
    + &lsm_xattr.value_len);
    if (rc) {
    if (rc == -EOPNOTSUPP)
    return 0;
    return rc;
    }
    - rc = do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, name, value, len, 0);
    -
    - kfree(name);
    - kfree(value);
    + rc = do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, lsm_xattr.name,
    + lsm_xattr.value, lsm_xattr.value_len, 0);
    + if (rc)
    + goto out;
    + rc = evm_inode_post_init_security(inode, &lsm_xattr, &evm_xattr);
    + if (err)
    + goto out;
    + rc = do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, evm_xattr.name,
    + evm_xattr.value, evm_xattr.value_len, 0);
    + kfree(evm_xattr.value);
    +out:
    + kfree(lsm_xattr.name);
    + kfree(lsm_xattr.value);
    return rc;
    }

    --
    1.7.3.4


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