Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756266Ab1EPOs3 (ORCPT ); Mon, 16 May 2011 10:48:29 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:42617 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755799Ab1EPOsZ (ORCPT ); Mon, 16 May 2011 10:48:25 -0400 From: Mimi Zohar To: linux-security-module@vger.kernel.org Cc: Mimi Zohar , jfs-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, James Morris , David Safford , Andrew Morton , Greg KH , Dmitry Kasatkin , Dave Kleikamp , Mimi Zohar Subject: [PATCH v5 15/21] evm: add evm_inode_post_init call in jfs Date: Mon, 16 May 2011 10:45:09 -0400 Message-Id: <1305557115-15652-16-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: 2562 Lines: 93 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/jfs/xattr.c | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 deletions(-) diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index 24838f1..68b4ec6 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_dmap.h" @@ -1095,33 +1096,49 @@ int jfs_init_security(tid_t tid, struct inode *inode, struct inode *dir, const struct qstr *qstr) { int rc; - size_t len; - void *value; - char *suffix; + struct xattr lsm_xattr; + struct xattr evm_xattr; char *name; - rc = security_inode_init_security(inode, dir, qstr, &suffix, &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; } - name = kmalloc(XATTR_SECURITY_PREFIX_LEN + 1 + strlen(suffix), + name = kmalloc(XATTR_SECURITY_PREFIX_LEN + 1 + strlen(lsm_xattr.name), GFP_NOFS); if (!name) { rc = -ENOMEM; - goto kmalloc_failed; - } - strcpy(name, XATTR_SECURITY_PREFIX); - strcpy(name + XATTR_SECURITY_PREFIX_LEN, suffix); + } else { + strcpy(name, XATTR_SECURITY_PREFIX); + strcpy(name + XATTR_SECURITY_PREFIX_LEN, lsm_xattr.name); - rc = __jfs_setxattr(tid, inode, name, value, len, 0); + rc = __jfs_setxattr(tid, inode, name, lsm_xattr.value, + lsm_xattr.value_len, 0); + kfree(name); + } + if (rc) + goto kmalloc_failed; - kfree(name); + rc = evm_inode_post_init_security(inode, &lsm_xattr, &evm_xattr); + if (rc) + goto kmalloc_failed; + name = kasprintf(GFP_NOFS, "%s%s", XATTR_SECURITY_PREFIX, + evm_xattr.name); + if (!name) { + rc = -ENOMEM; + } else { + rc = __jfs_setxattr(tid, inode, name, evm_xattr.value, + evm_xattr.value_len, 0); + kfree(name); + } + kfree(evm_xattr.value); kmalloc_failed: - kfree(suffix); - kfree(value); + kfree(lsm_xattr.name); + kfree(lsm_xattr.value); return rc; } -- 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/