From patchwork Tue Aug 21 15:59:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 10571995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37EC41390 for ; Tue, 21 Aug 2018 15:59:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 269652A9AE for ; Tue, 21 Aug 2018 15:59:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AA812A9B4; Tue, 21 Aug 2018 15:59:16 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 9D4462A9AE for ; Tue, 21 Aug 2018 15:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728171AbeHUTT5 (ORCPT ); Tue, 21 Aug 2018 15:19:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59578 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727031AbeHUTT5 (ORCPT ); Tue, 21 Aug 2018 15:19:57 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A53840201D3; Tue, 21 Aug 2018 15:59:13 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-123-147.rdu2.redhat.com [10.10.123.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EEDB1010413; Tue, 21 Aug 2018 15:59:12 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 21/23] TPMLIB: Implement call to TPM_LoadKey2 From: David Howells To: denkenz@gmail.com, jarkko.sakkinen@linux.intel.com, jejb@linux.vnet.ibm.com Cc: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org Date: Tue, 21 Aug 2018 16:59:11 +0100 Message-ID: <153486715192.13066.16960521772592007978.stgit@warthog.procyon.org.uk> In-Reply-To: <153486700916.13066.12870860668352070081.stgit@warthog.procyon.org.uk> References: <153486700916.13066.12870860668352070081.stgit@warthog.procyon.org.uk> User-Agent: StGit/unknown-version MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 21 Aug 2018 15:59:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 21 Aug 2018 15:59:13 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dhowells@redhat.com' RCPT:'' Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Implement a function to invoke TPM_LoadKey2 Signed-off-by: David Howells --- drivers/char/tpm/tpm-library.c | 93 ++++++++++++++++++++++++++++++++++++++++ include/linux/tpm.h | 7 +++ include/linux/tpm_command.h | 1 3 files changed, 101 insertions(+) diff --git a/drivers/char/tpm/tpm-library.c b/drivers/char/tpm/tpm-library.c index 3413abeb3635..d279243ccc00 100644 --- a/drivers/char/tpm/tpm-library.c +++ b/drivers/char/tpm/tpm-library.c @@ -1017,6 +1017,99 @@ out: } EXPORT_SYMBOL_GPL(tpm_create_wrap_key); +/** + * tpm_load_key2 - Load a key and decrypt it + * @chip: The chip to use + * @tb: Large scratch buffer for I/O + * @parent_type: Type of entity attached to @parent_handle + * @parent_handle: TPM-resident key used to encrypt + * @parent_auth: Parent authorisation HMAC key + * @wrapped_key: The wrapped key + * @_key_handle: The TPM's handle on the key + * + * Have the TPM decrypt a key and load it into its memory. The TPM then + * returns a handle to the key that we can use in other operations. + * + * AUTH1 is used for sealing key. + */ +int tpm_load_key2(struct tpm_chip *chip, + enum tpm_entity_type parent_type, + uint32_t parent_handle, + const unsigned char *parent_auth, + const struct tpm_wrapped_key *wrapped_key, + uint32_t *_key_handle) +{ + struct tpm_osapsess sess; + struct tpm_digests *td; + struct tpm_buf *tb; + unsigned char cont; + __be32 ordinal_be; + int ret; + + kenter(""); + + /* alloc some work space */ + tb = kmalloc(sizeof(*tb) + sizeof(*td), GFP_KERNEL); + if (!tb) + return -ENOMEM; + td = (void *)tb + sizeof(*tb); + + /* Get the encryption session */ + ret = tpm_create_osap(chip, tb, &sess, + parent_auth, parent_type, parent_handle); + if (ret < 0) + goto out; + dump_sess(&sess); + + /* Set up the parameters we will be sending */ + ret = tpm_gen_odd_nonce(chip, &td->ononce); + if (ret < 0) + goto out; + + /* calculate authorization HMAC value */ + ordinal_be = cpu_to_be32(TPM_ORD_LOADKEY2); + cont = 0; + ret = TSS_authhmac(td->pubauth, sess.secret, SHA1_DIGEST_SIZE, + &sess.enonce, &td->ononce, cont, + /* 1S */ sizeof(__be32), &ordinal_be, + /* 2S */ wrapped_key->data_len, wrapped_key->data, + 0, NULL); + if (ret < 0) + goto out; + + /* build and send the TPM request packet */ + INIT_BUF(tb); + store16(tb, TPM_TAG_RQU_AUTH1_COMMAND); + store32(tb, TPM_DATA_OFFSET + 4 + wrapped_key->data_len + 45); + store32(tb, TPM_ORD_LOADKEY2); + store32(tb, parent_handle); + store_s(tb, wrapped_key->data, wrapped_key->data_len); + store32(tb, sess.handle); + store_s(tb, td->ononce.data, TPM_NONCE_SIZE); + store_8(tb, cont); + store_s(tb, td->pubauth, SHA1_DIGEST_SIZE); + + ret = tpm_send_dump(chip, tb, "loading key"); + if (ret < 0) + goto out; + + /* Check the HMAC in the response */ + ret = TSS_checkhmac1(tb, ordinal_be, &td->ononce, + sess.secret, SHA1_DIGEST_SIZE, + 0, NULL); + if (ret < 0) + goto out; + + *_key_handle = LOAD32(tb); + ret = 0; + +out: + kfree(tb); + kleave(" = %d [%08x]", ret, *_key_handle); + return ret; +} +EXPORT_SYMBOL_GPL(tpm_load_key2); + /** * tpm_library_use - Tell the TPM library we want to make use of it * diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 0bc954ac8266..2be0decff93b 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -147,4 +147,11 @@ extern int tpm_create_wrap_key(struct tpm_chip *chip, const unsigned char *usage_auth, const unsigned char *migration_auth, struct tpm_wrapped_key **_wrapped_key); +extern int tpm_load_key2(struct tpm_chip *chip, + enum tpm_entity_type parent_type, + uint32_t parent_handle, + const unsigned char *parent_auth, + const struct tpm_wrapped_key *wrapped_key, + uint32_t *_key_handle); + #endif diff --git a/include/linux/tpm_command.h b/include/linux/tpm_command.h index 0417a3db7e8f..211d4ce75f67 100644 --- a/include/linux/tpm_command.h +++ b/include/linux/tpm_command.h @@ -23,6 +23,7 @@ enum tpm_ordinal { TPM_ORD_SEAL = 23, TPM_ORD_UNSEAL = 24, TPM_ORD_CREATEWRAPKEY = 31, + TPM_ORD_LOADKEY2 = 65, TPM_ORD_GET_RANDOM = 70, TPM_ORD_CONTINUE_SELFTEST = 83, TPM_ORD_GET_CAP = 101,