[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1307017423-15093-16-git-send-email-zohar@linux.vnet.ibm.com>
Date: Thu, 2 Jun 2011 08:23:38 -0400
From: Mimi Zohar <zohar@...ux.vnet.ibm.com>
To: linux-security-module@...r.kernel.org
Cc: Mimi Zohar <zohar@...ux.vnet.ibm.com>,
linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
James Morris <jmorris@...ei.org>,
David Safford <safford@...son.ibm.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Greg KH <greg@...ah.com>,
Dmitry Kasatkin <dmitry.s.kasatkin@...il.com>,
Alex Elder <aelder@....com>, xfs@....sgi.com,
Mimi Zohar <zohar@...ibm.com>
Subject: [PATCH v6 15/20] evm: add evm_inode_post_init call in xfs
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@...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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists