From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061Ab1HKRTa (ORCPT ); Thu, 11 Aug 2011 13:19:30 -0400 Received: from mga09.intel.com ([134.134.136.24]:14816 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722Ab1HKRT1 (ORCPT ); Thu, 11 Aug 2011 13:19:27 -0400 From: Dmitry Kasatkin To: linux-security-module@vger.kernel.org Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, zohar@linux.vnet.ibm.com Subject: [RFC v1.1 5/5] evm: creates dedicated evm keyring to store public keys Date: Thu, 11 Aug 2011 20:20:08 +0300 Message-Id: X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Kasatkin EVM/IMA might perform lots of signature verification operations. For that reason performance is very critical. This patch adds evm_keyring to store public keys used by EVM only. Signed-off-by: Dmitry Kasatkin Acked-by: Mimi Zohar --- security/integrity/evm/evm.h | 4 +++- security/integrity/evm/evm_main.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/security/integrity/evm/evm.h b/security/integrity/evm/evm.h index 9e1bcba..4f4ba20 100644 --- a/security/integrity/evm/evm.h +++ b/security/integrity/evm/evm.h @@ -32,6 +32,8 @@ extern struct crypto_shash *hash_tfm; /* List of EVM protected security xattrs */ extern char *evm_config_xattrnames[]; +extern struct key *evm_keyring; + extern int evm_init_key(void); extern int evm_update_evmxattr(struct dentry *dentry, const char *req_xattr_name, @@ -53,7 +55,7 @@ extern void evm_cleanup_secfs(void); static inline int evm_sign_verify(const char *sig, int siglen, const char *digest, int digestlen) { - return ksign_verify(NULL, sig, siglen, digest, digestlen); + return ksign_verify(evm_keyring, sig, siglen, digest, digestlen); } #else diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index a99c644..73c0568 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "evm.h" int evm_initialized; @@ -38,6 +39,8 @@ char *evm_config_xattrnames[] = { NULL }; +struct key *evm_keyring; + static int evm_fixmode; static int __init evm_set_fixmode(char *str) { @@ -382,18 +385,33 @@ static int __init init_evm(void) { int error; +#ifdef CONFIG_EVM_DIGSIG + evm_keyring = keyring_alloc("_evm", 0, 0, &init_cred, + KEY_ALLOC_NOT_IN_QUOTA, NULL); + if (IS_ERR(evm_keyring)) + return PTR_ERR(evm_keyring); +#endif + error = evm_init_secfs(); if (error < 0) { printk(KERN_INFO "EVM: Error registering secfs\n"); goto err; } + + return 0; err: +#ifdef CONFIG_EVM_DIGSIG + key_put(evm_keyring); +#endif return error; } static void __exit cleanup_evm(void) { evm_cleanup_secfs(); +#ifdef CONFIG_EVM_DIGSIG + key_put(evm_keyring); +#endif if (hmac_tfm) crypto_free_shash(hmac_tfm); if (hash_tfm) -- 1.7.4.1