From patchwork Thu Nov 3 18:01:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 15081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp686314wru; Thu, 3 Nov 2022 11:06:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ovG7lWzeuJQsYOD9VbQcLqoOMAEjWy4qZ24CdACBXTHP8D6cRbaMeVpLEveYS2lgoemUa X-Received: by 2002:a17:906:8b81:b0:7ae:e8f:395c with SMTP id nr1-20020a1709068b8100b007ae0e8f395cmr7028526ejc.53.1667498805442; Thu, 03 Nov 2022 11:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667498805; cv=none; d=google.com; s=arc-20160816; b=vVv15g5Yq9TsipW/N9B3RUNwJrr0PK9GU2BEm/w24k8z6JVugU5Pu/kpUYXb4/c5KT CECtfY6EVZwWsOZdp73wgwZ+fMrdIxyZpQN47tj3HC5Gatb/t9rm9Q0EOqfFhuhTvRwU 22/vcAA0X7Qh8tg4Fwy1KvSlfR7jJnMA8OZF/UT/R2UhY/AQ9xggj0ZYXoQ2CgIeY//c Mk+IcBQxs4bJyr5r36ylpcIOfe8HxTHqEcO59zFuqrCBUM7RDSQa/Te17weMrJKwW/Xb oi1hdljVQ1Uvt4/iOM+OGSrwv3Wc1+NkxSCNklGX7E9+q9/3LjPN3W1rVJw23T/X8CYs twgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=izZdOIN6JWP3fwMuNlCfXVu66JA2QFEY9SoPm54SNBw=; b=IjuyAc8RL7ffZxnFUETnsxbg9pnbO8l+M4PSyIRhhbrJ6+nX67BECFuf2vzEH/U/y2 gBcmPrPAhGGyzMtqN50MRTMNbIAbZrDRF6eTBQYFRz5SXTpnbAOBs4pXXrwGx4xOKkvP 0ciYveoG2GA9Ac1QTJ4BXi4Gz2KoLYbreIvTHwTV/MncLn5eE5csx3Ubk0zByEcxl5TN r+aaTPWr7G07S7VLGhKBCBNvqP72BOVq0cQGDzBs/HcOW33EcbBrSNdXcjESMzGltoT1 O4rYNpgSMoy6UdW3pP721pBah+DAAFOIJl+B9MTaAiGzhqsPKshJr8SYNvVHCK+Cauoi E4Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MOY3PJGr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n1-20020a1709065e0100b00781d695b597si1556152eju.473.2022.11.03.11.06.20; Thu, 03 Nov 2022 11:06:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MOY3PJGr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbiKCSFb (ORCPT + 99 others); Thu, 3 Nov 2022 14:05:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbiKCSEH (ORCPT ); Thu, 3 Nov 2022 14:04:07 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2567823BC5 for ; Thu, 3 Nov 2022 11:01:47 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id u8-20020a17090a5e4800b002106dcdd4a0so6004138pji.1 for ; Thu, 03 Nov 2022 11:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=izZdOIN6JWP3fwMuNlCfXVu66JA2QFEY9SoPm54SNBw=; b=MOY3PJGr2LIy205MrPpag/ClsGw4MP56tI7WpOwNj6gRfuTiQCVn98MtRZStlxteOr z/rYnBoJ3tFl3LO6m2/egnvL4bcl7xkZx16guu7qdEyEmyMdVtcyQ9dR/pPXZQo6EsME JCOc9PvVPmrBN7ZLPAp3bUoEUQZ3DsvlFd5so= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=izZdOIN6JWP3fwMuNlCfXVu66JA2QFEY9SoPm54SNBw=; b=MIVEt2yH2AyWOb+eI7kJfLdg8jEv/qZP51SCCjxgCwkDamCpj97RrbKDDF6+S2PPn7 uOnDGxaaTsb4s951GFynJNHBBFHRtMbFheX/7myi3fqKXy5Hb8iTT1vSENx70SuNZrVj TYFQ/8lbPgHKWNPzqLS7YgccqfV6awwFOTKJvefH61Zuxoc83CBSJ0goIYfRp5hq/TGg 68dqGN6lCHHz31eYK30p5NSAdHsb8uqjHG6zQXvcRvftGKCQi/jz8Lqf4By0dg5S92vL gjlUl9alpNlzJZCAH0JD8c9sNCN/XiHpY4TiZNFEi6NuDLlkGwdZNu5iTHywJpe6ftzD Dpvw== X-Gm-Message-State: ACrzQf0yI318yxtdhzYRcaReoVqM3mOsDJvi8NR6RWAxcSm9Rb4Zo8Ef x3zZrm5hzakx4J8oLNW5Vcu4iEhrz+4JlEwx X-Received: by 2002:a17:90a:540e:b0:210:1e26:9422 with SMTP id z14-20020a17090a540e00b002101e269422mr31496427pjh.100.1667498506839; Thu, 03 Nov 2022 11:01:46 -0700 (PDT) Received: from evgreen-glaptop.lan ([98.45.28.95]) by smtp.gmail.com with ESMTPSA id t12-20020a1709027fcc00b00177fb862a87sm1000277plb.20.2022.11.03.11.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 11:01:46 -0700 (PDT) From: Evan Green To: linux-kernel@vger.kernel.org Cc: corbet@lwn.net, linux-pm@vger.kernel.org, rjw@rjwysocki.net, gwendal@chromium.org, apronin@chromium.org, Pavel Machek , Kees Cook , Matthew Garrett , linux-integrity@vger.kernel.org, jejb@linux.ibm.com, zohar@linux.ibm.com, dlunev@google.com, Eric Biggers , Ben Boeckel , jarkko@kernel.org, Matthew Garrett , Matthew Garrett , Evan Green , Ben Boeckel , David Howells , James Morris , Paul Moore , "Serge E. Hallyn" , keyrings@vger.kernel.org, linux-doc@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v4 05/11] security: keys: trusted: Allow storage of PCR values in creation data Date: Thu, 3 Nov 2022 11:01:13 -0700 Message-Id: <20221103105558.v4.5.I32591db064b6cdc91850d777f363c9d05c985b39@changeid> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221103180120.752659-1-evgreen@chromium.org> References: <20221103180120.752659-1-evgreen@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748499227720341527?= X-GMAIL-MSGID: =?utf-8?q?1748499227720341527?= From: Matthew Garrett When TPMs generate keys, they can also generate some information describing the state of the PCRs at creation time. This data can then later be certified by the TPM, allowing verification of the PCR values. This allows us to determine the state of the system at the time a key was generated. Add an additional argument to the trusted key creation options, allowing the user to provide the set of PCRs that should have their values incorporated into the creation data. Link: https://lore.kernel.org/lkml/20210220013255.1083202-6-matthewgarrett@google.com/ Signed-off-by: Matthew Garrett Signed-off-by: Evan Green Reviewed-by: Ben Boeckel Reviewed-by: Kees Cook --- (no changes since v3) Changes in v3: - Clarified creationpcrs documentation (Ben) .../security/keys/trusted-encrypted.rst | 6 +++++ include/keys/trusted-type.h | 1 + security/keys/trusted-keys/trusted_tpm1.c | 9 +++++++ security/keys/trusted-keys/trusted_tpm2.c | 25 +++++++++++++++++-- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst index 9bc9db8ec6517c..a1872964fe862f 100644 --- a/Documentation/security/keys/trusted-encrypted.rst +++ b/Documentation/security/keys/trusted-encrypted.rst @@ -199,6 +199,12 @@ Usage:: policyhandle= handle to an authorization policy session that defines the same policy and with the same hash algorithm as was used to seal the key. + creationpcrs= hex integer representing the set of PCRs to be + included in the creation data. For each bit set, the + corresponding PCR will be included in the key creation + data. Bit 0 corresponds to PCR0. Currently only the first + PC standard 24 PCRs are supported on the currently active + bank. Leading zeroes are optional. TPM2 only. "keyctl print" returns an ascii hex copy of the sealed key, which is in standard TPM_STORED_DATA format. The key length for new keys are always in bytes. diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h index 209086fed240a5..8523d41507b2a4 100644 --- a/include/keys/trusted-type.h +++ b/include/keys/trusted-type.h @@ -54,6 +54,7 @@ struct trusted_key_options { uint32_t policydigest_len; unsigned char policydigest[MAX_DIGEST_SIZE]; uint32_t policyhandle; + uint32_t creation_pcrs; }; struct trusted_key_ops { diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index aa108bea6739b3..2975827c01bec0 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -713,6 +713,7 @@ enum { Opt_hash, Opt_policydigest, Opt_policyhandle, + Opt_creationpcrs, }; static const match_table_t key_tokens = { @@ -725,6 +726,7 @@ static const match_table_t key_tokens = { {Opt_hash, "hash=%s"}, {Opt_policydigest, "policydigest=%s"}, {Opt_policyhandle, "policyhandle=%s"}, + {Opt_creationpcrs, "creationpcrs=%s"}, {Opt_err, NULL} }; @@ -858,6 +860,13 @@ static int getoptions(char *c, struct trusted_key_payload *pay, return -EINVAL; opt->policyhandle = handle; break; + case Opt_creationpcrs: + if (!tpm2) + return -EINVAL; + res = kstrtoint(args[0].from, 16, &opt->creation_pcrs); + if (res < 0) + return -EINVAL; + break; default: return -EINVAL; } diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index e1388d7d799a36..a7ad83bc0e5396 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -401,7 +401,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, struct tpm_buf buf; u32 hash; u32 flags; - int i; + int i, j; int rc; for (i = 0; i < ARRAY_SIZE(tpm2_hash_map); i++) { @@ -470,7 +470,28 @@ int tpm2_seal_trusted(struct tpm_chip *chip, tpm_buf_append_u16(&buf, 0); /* creation PCR */ - tpm_buf_append_u32(&buf, 0); + if (options->creation_pcrs) { + /* One bank */ + tpm_buf_append_u32(&buf, 1); + /* Which bank to use */ + tpm_buf_append_u16(&buf, hash); + /* Length of the PCR bitmask */ + tpm_buf_append_u8(&buf, 3); + /* PCR bitmask */ + for (i = 0; i < 3; i++) { + char tmp = 0; + + for (j = 0; j < 8; j++) { + char bit = (i * 8) + j; + + if (options->creation_pcrs & (1 << bit)) + tmp |= (1 << j); + } + tpm_buf_append_u8(&buf, tmp); + } + } else { + tpm_buf_append_u32(&buf, 0); + } if (buf.flags & TPM_BUF_OVERFLOW) { rc = -E2BIG;