Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756389Ab1EPOs5 (ORCPT ); Mon, 16 May 2011 10:48:57 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:47292 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755650Ab1EPOsx (ORCPT ); Mon, 16 May 2011 10:48:53 -0400 From: Mimi Zohar To: linux-security-module@vger.kernel.org Cc: Mimi Zohar , cluster-devel@redhat.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, James Morris , David Safford , Andrew Morton , Greg KH , Dmitry Kasatkin , Steven Whitehouse , Mimi Zohar Subject: [PATCH v5 13/21] evm: add evm_inode_post_init call in gfs2 Date: Mon, 16 May 2011 10:45:07 -0400 Message-Id: <1305557115-15652-14-git-send-email-zohar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1305557115-15652-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1305557115-15652-1-git-send-email-zohar@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2066 Lines: 72 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 --- fs/gfs2/inode.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 97d54a2..5ce875b 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include "gfs2.h" @@ -767,12 +768,12 @@ static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip, const struct qstr *qstr) { int err; - size_t len; - void *value; - char *name; + struct xattr lsm_xattr; + struct xattr evm_xattr; err = security_inode_init_security(&ip->i_inode, &dip->i_inode, qstr, - &name, &value, &len); + &lsm_xattr.name, &lsm_xattr.value, + &lsm_xattr.value_len); if (err) { if (err == -EOPNOTSUPP) @@ -780,11 +781,20 @@ static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip, return err; } - err = __gfs2_xattr_set(&ip->i_inode, name, value, len, 0, - GFS2_EATYPE_SECURITY); - kfree(value); - kfree(name); - + err = __gfs2_xattr_set(&ip->i_inode, lsm_xattr.name, lsm_xattr.value, + lsm_xattr.value_len, 0, GFS2_EATYPE_SECURITY); + if (err < 0) + goto out; + err = evm_inode_post_init_security(&ip->i_inode, &lsm_xattr, + &evm_xattr); + if (err) + goto out; + err = __gfs2_xattr_set(&ip->i_inode, evm_xattr.name, evm_xattr.value, + evm_xattr.value_len, 0, GFS2_EATYPE_SECURITY); + kfree(evm_xattr.value); +out: + kfree(lsm_xattr.name); + kfree(lsm_xattr.value); return err; } -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/