From patchwork Thu Jul 21 23:31:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 9242661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D92D602F0 for ; Thu, 21 Jul 2016 23:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 818981FF0B for ; Thu, 21 Jul 2016 23:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 762A920120; Thu, 21 Jul 2016 23:31:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B59C1FF0B for ; Thu, 21 Jul 2016 23:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbcGUXbq (ORCPT ); Thu, 21 Jul 2016 19:31:46 -0400 Received: from mga09.intel.com ([134.134.136.24]:39366 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752648AbcGUXbo (ORCPT ); Thu, 21 Jul 2016 19:31:44 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 21 Jul 2016 16:31:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,401,1464678000"; d="scan'208";a="737985693" Received: from mjmartin-nuc01.wa.intel.com ([10.232.97.131]) by FMSMGA003.fm.intel.com with ESMTP; 21 Jul 2016 16:31:41 -0700 From: Mat Martineau To: keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, dhowells@redhat.com Cc: Mat Martineau , zohar@linux.vnet.ibm.com, marcel@holtmann.org Subject: [PATCH v6 5/6] KEYS: Add a lookup_restrict function for the asymmetric key type Date: Thu, 21 Jul 2016 16:31:38 -0700 Message-Id: <20160721233139.4085-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160721233139.4085-1-mathew.j.martineau@linux.intel.com> References: <20160721233139.4085-1-mathew.j.martineau@linux.intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Look up asymmetric keyring restriction functions using the key-type lookup_restrict hook. Signed-off-by: Mat Martineau --- crypto/asymmetric_keys/asymmetric_type.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c index 77aa44a..261f058 100644 --- a/crypto/asymmetric_keys/asymmetric_type.c +++ b/crypto/asymmetric_keys/asymmetric_type.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "asymmetric_keys.h" MODULE_LICENSE("GPL"); @@ -491,6 +492,21 @@ static int asymmetric_key_verify_signature(struct kernel_pkey_params *params, return verify_signature(params->key, &sig); } +/* + * look up keyring restrict functions for asymmetric keys + */ +static restrict_link_func_t asymmetric_lookup_restrict(const char *restriction) +{ + if (strcmp("keyring", restriction) == 0) + return restrict_link_by_keyring; + else if (strcmp("builtin_trusted", restriction) == 0) + return restrict_link_by_builtin_trusted; + else if (strcmp("builtin_and_secondary_trusted", restriction) == 0) + return restrict_link_by_builtin_and_secondary_trusted; + else + return ERR_PTR(-EINVAL); +} + struct key_type key_type_asymmetric = { .name = "asymmetric", .preparse = asymmetric_key_preparse, @@ -503,6 +519,7 @@ struct key_type key_type_asymmetric = { .asym_query = query_asymmetric_key, .asym_eds_op = asymmetric_key_eds_op, .asym_verify_signature = asymmetric_key_verify_signature, + .lookup_restrict = asymmetric_lookup_restrict, }; EXPORT_SYMBOL_GPL(key_type_asymmetric);