xfs
[Top] [All Lists]

[PATCH v5 16/21] evm: add evm_inode_post_init call in xfs

To: linux-security-module@xxxxxxxxxxxxxxx
Subject: [PATCH v5 16/21] evm: add evm_inode_post_init call in xfs
From: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date: Mon, 16 May 2011 10:45:10 -0400
Cc: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>, xfs@xxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, James Morris <jmorris@xxxxxxxxx>, David Safford <safford@xxxxxxxxxxxxxx>, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Greg KH <greg@xxxxxxxxx>, Dmitry Kasatkin <dmitry.kasatkin@xxxxxxxxx>, Alex Elder <aelder@xxxxxxx>, Mimi Zohar <zohar@xxxxxxxxxx>
In-reply-to: <1305557115-15652-1-git-send-email-zohar@xxxxxxxxxxxxxxxxxx>
References: <1305557115-15652-1-git-send-email-zohar@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxx>
---
 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

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH v5 16/21] evm: add evm_inode_post_init call in xfs, Mimi Zohar <=