From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-integrity@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
keyrings@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v6 19/20] tpm: add the null key name as a sysfs export
Date: Tue, 2 Jan 2024 12:04:07 -0500 [thread overview]
Message-ID: <20240102170408.21969-20-James.Bottomley@HansenPartnership.com> (raw)
In-Reply-To: <20240102170408.21969-1-James.Bottomley@HansenPartnership.com>
This is the last component of encrypted tpm2 session handling that
allows us to verify from userspace that the key derived from the NULL
seed genuinely belongs to the TPM and has not been spoofed.
The procedure for doing this involves creating an attestation identity
key (which requires verification of the TPM EK certificate) and then
using that AIK to sign a certification of the Elliptic Curve key over
the NULL seed. Userspace must create this EC Key using the parameters
prescribed in TCG TPM v2.0 Provisioning Guidance for the SRK ECC; if
this is done correctly the names will match and the TPM can then run a
TPM2_Certify operation on this derived primary key using the newly
created AIK.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
v6: change config name
---
drivers/char/tpm/tpm-sysfs.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index 54c71473aa29..874c2c5fe79f 100644
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -309,6 +309,21 @@ static ssize_t tpm_version_major_show(struct device *dev,
}
static DEVICE_ATTR_RO(tpm_version_major);
+#ifdef CONFIG_TCG_TPM2_HMAC
+static ssize_t null_name_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct tpm_chip *chip = to_tpm_chip(dev);
+ int size = TPM2_NAME_SIZE;
+
+ bin2hex(buf, chip->tpmkeyname, size);
+ size *= 2;
+ buf[size++] = '\n';
+ return size;
+}
+static DEVICE_ATTR_RO(null_name);
+#endif
+
static struct attribute *tpm1_dev_attrs[] = {
&dev_attr_pubek.attr,
&dev_attr_pcrs.attr,
@@ -326,6 +341,9 @@ static struct attribute *tpm1_dev_attrs[] = {
static struct attribute *tpm2_dev_attrs[] = {
&dev_attr_tpm_version_major.attr,
+#ifdef CONFIG_TCG_TPM2_HMAC
+ &dev_attr_null_name.attr,
+#endif
NULL
};
--
2.35.3
next prev parent reply other threads:[~2024-01-02 17:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 17:03 [PATCH v6 00/20] add integrity and security to TPM2 transactions James Bottomley
2024-01-02 17:03 ` [PATCH v6 01/20] tpm: Remove unused tpm_buf_tag() James Bottomley
2024-01-02 17:03 ` [PATCH v6 02/20] tpm: Remove tpm_send() James Bottomley
2024-01-02 17:03 ` [PATCH v6 03/20] tpm: Move buffer handling from static inlines to real functions James Bottomley
2024-01-02 17:03 ` [PATCH v6 04/20] tpm: Update struct tpm_buf documentation comments James Bottomley
2024-01-02 17:03 ` [PATCH v6 05/20] tpm: Store the length of the tpm_buf data separately James Bottomley
2024-01-02 17:03 ` [PATCH v6 06/20] tpm: TPM2B formatted buffers James Bottomley
2024-01-02 17:03 ` [PATCH v6 07/20] tpm: Add tpm_buf_read_{u8,u16,u32} James Bottomley
2024-01-02 17:03 ` [PATCH v6 08/20] KEYS: trusted: tpm2: Use struct tpm_buf for sized buffers James Bottomley
2024-01-02 17:03 ` [PATCH v6 09/20] crypto: lib - implement library version of AES in CFB mode James Bottomley
2024-01-03 14:59 ` Jarkko Sakkinen
2024-01-02 17:03 ` [PATCH v6 10/20] tpm: add buffer function to point to returned parameters James Bottomley
2024-01-03 15:00 ` Jarkko Sakkinen
2024-01-02 17:03 ` [PATCH v6 11/20] tpm: export the context save and load commands James Bottomley
2024-01-03 15:01 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 12/20] tpm: Add NULL primary creation James Bottomley
2024-01-03 15:11 ` Jarkko Sakkinen
2024-01-03 15:25 ` James Bottomley
2024-01-04 17:56 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 13/20] tpm: Add HMAC session start and end functions James Bottomley
2024-01-03 15:18 ` Jarkko Sakkinen
2024-01-03 15:31 ` James Bottomley
2024-01-04 18:09 ` Jarkko Sakkinen
2024-01-04 22:25 ` James Bottomley
2024-01-05 15:36 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 14/20] tpm: Add HMAC session name/handle append James Bottomley
2024-01-03 15:19 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 15/20] tpm: Add the rest of the session HMAC API James Bottomley
2024-01-03 15:20 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 16/20] tpm: add hmac checks to tpm2_pcr_extend() James Bottomley
2024-01-03 15:21 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 17/20] tpm: add session encryption protection to tpm2_get_random() James Bottomley
2024-01-03 15:21 ` Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 18/20] KEYS: trusted: Add session encryption protection to the seal/unseal path James Bottomley
2024-01-03 15:22 ` Jarkko Sakkinen
2024-01-02 17:04 ` James Bottomley [this message]
2024-01-03 15:22 ` [PATCH v6 19/20] tpm: add the null key name as a sysfs export Jarkko Sakkinen
2024-01-02 17:04 ` [PATCH v6 20/20] Documentation: add tpm-security.rst James Bottomley
2024-01-03 15:24 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240102170408.21969-20-James.Bottomley@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=ardb@kernel.org \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox