Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2812702rwb; Fri, 11 Nov 2022 15:31:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf6JIZwnO39Wj9GYw5xoepOFmsm9JfOAmjWG2UI916Zn6HCjuIaP4hXmQhyW6d8dX5+GnBz/ X-Received: by 2002:a17:906:f904:b0:7ad:7e85:8056 with SMTP id lc4-20020a170906f90400b007ad7e858056mr3735750ejb.40.1668209488479; Fri, 11 Nov 2022 15:31:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668209488; cv=none; d=google.com; s=arc-20160816; b=gbBbTXsuYhSJmSLf6PUb3ml+BTzCBvKITHkkvFZVb2lKFGPhhrt/fBYpvbYiQ15iun 0+nenvQRy8U6Dsw2NVa12PgO/wuBcOBE3+l/nKEya62V31WhJb1gpJhaTlRyvitJycQu fAr3ZB53U9Oht7pGg2sSx3apAtsqOxKVfVlHHzjtGEA081OHeFYf8YKIdEqDbxEcHuMC s4CAC0399A4EX7NgoyEqrMaRrjho36+hlxHO2Q+tVr807X2EbM9xCx7aF8B710SOk2+4 9CUhREAvNgnCsCwn4EA7VckXzrlhGvJZdfiX5eipC3MmqQ/s4KkWcxO73nQ3Vss9Ce73 gbkg== 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=GWKuj/eVGsjPGfeZMJPQpDngtMSO4dbOJNBV15jTv7M=; b=vtvTpE9r1oN6M8RSaXm3mF+6T5qUAnmh55okOJBKEt7GtKt5s4U3imFAzBRb08YjuK hnUaoGsFSbQo6dcZvKZBBA84c+o7NT54r3MCKb0OpfLRkewFfdEQ/rTEk21+MuzF/uIs Z8Vg0FVppUrc03r4ucGRySr5i2gPQ3j0Y/vtyS++Zl5slXsDYmPudccYasbhisKwUWJh ADnrOElOP0GEnqUHJMIM/EvzUqWoHVjid8urgxIr261ayXPBXdPAolj3Q2bUk0bURDMP WisEm7McYLMBYjk7/oaqOUh6c3mqon5QpaMPuwryPxyLFVyaIsx5y866DMH6K6kYfTIR AnDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DG5hhRv0; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oz43-20020a1709077dab00b007ae0211844dsi2630355ejc.937.2022.11.11.15.31.07; Fri, 11 Nov 2022 15:31:28 -0800 (PST) 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=DG5hhRv0; 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 S234548AbiKKXT4 (ORCPT + 90 others); Fri, 11 Nov 2022 18:19:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234237AbiKKXTq (ORCPT ); Fri, 11 Nov 2022 18:19:46 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A88987BE44 for ; Fri, 11 Nov 2022 15:19:44 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id b185so6078090pfb.9 for ; Fri, 11 Nov 2022 15:19:44 -0800 (PST) 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=GWKuj/eVGsjPGfeZMJPQpDngtMSO4dbOJNBV15jTv7M=; b=DG5hhRv0qxpc7vpB6DKVxAhYG849dFoxC467fVtkgj9mQ+rEHe+uxo7VDd5tqqgZ4B syFdacQkQxC7N0D+1/2pJVqQtIVQ3QUgQDLUjhIw2Gb4aOCjP3+C7voHAKPTHl2tVovY 3sclybeIlhlxTczEC23A8WU+cHFp2XaGHWAro= 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=GWKuj/eVGsjPGfeZMJPQpDngtMSO4dbOJNBV15jTv7M=; b=F0019LhwFhvSfQ/QBAIXaTwAQDcaBsPDtsIlS4Vj3nga70zv0Dik8p2NNb66dcrpw0 ewUZu/wh7Uw/maz/5B9GGxB3cPEVl5aTPJMiwUff8ew/3NMWiErC0FpXF2eN+tSZnjYa 5HpRCEFExL4v6jE+wR1RtBXbv6scIgtEMITeBXVtYfPtiGDV/bBEykuumf/hjIA6t50Y 1S4Q1k6xvDVUGXRVHSOs99ri1BPulggL8vLGpFrnSVS0oeZ0zFs0/Ka1R4EcQlifWLRC 8j0uD8ebu4XpOh6AEJZlRPIrwKhrScAFg526svU5qsCTWAuNAdDqNUVLx/5GwrWNqX34 nFhA== X-Gm-Message-State: ANoB5plHYAHSaci85aP95TtlRMhoa9X1WtVmPAZWkHFWYBT39IlpHjdH 6SqFrkFBUvuMQNm/syLtnXRH7EYJx4F4XJtd X-Received: by 2002:a63:ce56:0:b0:457:e41:c767 with SMTP id r22-20020a63ce56000000b004570e41c767mr3478159pgi.244.1668208783934; Fri, 11 Nov 2022 15:19:43 -0800 (PST) Received: from evgreen-glaptop.lan ([98.45.28.95]) by smtp.gmail.com with ESMTPSA id x128-20020a623186000000b0056da2ad6503sm2106900pfx.39.2022.11.11.15.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 15:19:43 -0800 (PST) From: Evan Green To: linux-kernel@vger.kernel.org Cc: corbet@lwn.net, linux-integrity@vger.kernel.org, Eric Biggers , gwendal@chromium.org, dianders@chromium.org, apronin@chromium.org, Pavel Machek , Ben Boeckel , rjw@rjwysocki.net, jejb@linux.ibm.com, Kees Cook , dlunev@google.com, zohar@linux.ibm.com, Matthew Garrett , jarkko@kernel.org, linux-pm@vger.kernel.org, Evan Green , Matthew Garrett , Jason Gunthorpe , Peter Huewe Subject: [PATCH v5 03/11] tpm: Allow PCR 23 to be restricted to kernel-only use Date: Fri, 11 Nov 2022 15:16:28 -0800 Message-Id: <20221111151451.v5.3.I9ded8c8caad27403e9284dfc78ad6cbd845bc98d@changeid> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221111231636.3748636-1-evgreen@chromium.org> References: <20221111231636.3748636-1-evgreen@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.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 Introduce a new Kconfig, TCG_TPM_RESTRICT_PCR, which if enabled restricts usermode's ability to extend or reset PCR 23. Under certain circumstances it might be desirable to enable the creation of TPM-backed secrets that are only accessible to the kernel. In an ideal world this could be achieved by using TPM localities, but these don't appear to be available on consumer systems. An alternative is to simply block userland from modifying one of the resettable PCRs, leaving it available to the kernel. If the kernel ensures that no userland can access the TPM while it is carrying out work, it can reset PCR 23, extend it to an arbitrary value, create or load a secret, and then reset the PCR again. Even if userland somehow obtains the sealed material, it will be unable to unseal it since PCR 23 will never be in the appropriate state. This Kconfig is only properly supported for systems with TPM2 devices. For systems with TPM1 devices, having this Kconfig enabled completely restricts usermode's access to the TPM. TPM1 contains support for tunnelled transports, which usermode could use to smuggle commands through that this Kconfig is attempting to restrict. Link: https://lore.kernel.org/lkml/20210220013255.1083202-3-matthewgarrett@google.com/ Co-developed-by: Matthew Garrett Signed-off-by: Matthew Garrett Signed-off-by: Evan Green --- Changes in v5: - Change tags on RESTRICT_PCR patch (Kees) - Rename to TCG_TPM2_RESTRICT_PCR - Do nothing on TPM1.2 devices (Jarkko, Doug) Changes in v4: - Augment the commit message (Jarkko) Changes in v3: - Fix up commit message (Jarkko) - tpm2_find_and_validate_cc() was split (Jarkko) - Simply fully restrict TPM1 since v2 failed to account for tunnelled transport sessions (Stefan and Jarkko). Changes in v2: - Fixed sparse warnings drivers/char/tpm/Kconfig | 12 ++++++++++++ drivers/char/tpm/tpm-dev-common.c | 6 ++++++ drivers/char/tpm/tpm.h | 12 ++++++++++++ drivers/char/tpm/tpm2-cmd.c | 22 ++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 927088b2c3d3f2..e6d3aa9f6c694f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -211,4 +211,16 @@ config TCG_FTPM_TEE This driver proxies for firmware TPM running in TEE. source "drivers/char/tpm/st33zp24/Kconfig" + +config TCG_TPM2_RESTRICT_PCR + bool "Restrict userland access to PCR 23 on TPM2 devices" + depends on TCG_TPM + help + If set, block userland from extending or resetting PCR 23 on TPM2.0 + and later systems. This allows the PCR to be restricted to in-kernel + use, preventing userland from being able to make use of data sealed to + the TPM by the kernel. This is required for secure hibernation + support, but should be left disabled if any userland may require + access to PCR23. This is a TPM2-only feature, enabling this on a TPM1 + machine is effectively a no-op. endif # TCG_TPM diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c index dc4c0a0a512903..66d15a2a967443 100644 --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -198,6 +198,12 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf, priv->response_read = false; *off = 0; + if (priv->chip->flags & TPM_CHIP_FLAG_TPM2) { + ret = tpm2_cmd_restricted(priv->chip, priv->data_buffer, size); + if (ret) + goto out; + } + /* * If in nonblocking mode schedule an async job to send * the command return the size. diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index f1e0f490176f01..7fb746d210f59d 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -245,4 +245,16 @@ void tpm_bios_log_setup(struct tpm_chip *chip); void tpm_bios_log_teardown(struct tpm_chip *chip); int tpm_dev_common_init(void); void tpm_dev_common_exit(void); + +#ifdef CONFIG_TCG_TPM2_RESTRICT_PCR +#define TPM_RESTRICTED_PCR 23 + +int tpm2_cmd_restricted(struct tpm_chip *chip, u8 *buffer, size_t size); +#else +static inline int tpm2_cmd_restricted(struct tpm_chip *chip, u8 *buffer, + size_t size) +{ + return 0; +} +#endif #endif diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 303ce2ea02a4b0..3bc5546fddc792 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -778,3 +778,25 @@ int tpm2_find_cc(struct tpm_chip *chip, u32 cc) return -1; } + +#ifdef CONFIG_TCG_TPM2_RESTRICT_PCR +int tpm2_cmd_restricted(struct tpm_chip *chip, u8 *buffer, size_t size) +{ + int cc = tpm2_find_and_validate_cc(chip, NULL, buffer, size); + __be32 *handle; + + switch (cc) { + case TPM2_CC_PCR_EXTEND: + case TPM2_CC_PCR_RESET: + if (size < (TPM_HEADER_SIZE + sizeof(u32))) + return -EINVAL; + + handle = (__be32 *)&buffer[TPM_HEADER_SIZE]; + if (be32_to_cpu(*handle) == TPM_RESTRICTED_PCR) + return -EPERM; + break; + } + + return 0; +} +#endif -- 2.38.1.431.g37b22c650d-goog