From: Jonathan McDowell <noodles@earth.li>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: linux-integrity@vger.kernel.org,
Eric Biggers <ebiggers@kernel.org>,
David Howells <dhowells@redhat.com>,
Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
James Bottomley <James.Bottomley@hansenpartnership.com>,
Mimi Zohar <zohar@linux.ibm.com>,
"open list:KEYS/KEYRINGS" <keyrings@vger.kernel.org>,
"open list:SECURITY SUBSYSTEM"
<linux-security-module@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v8 02/12] KEYS: trusted: Use get_random_bytes_wait() instead of tpm_get_random()
Date: Fri, 19 Dec 2025 09:21:46 +0000 [thread overview]
Message-ID: <aUUZKu2xaZvEdq-2@earth.li> (raw)
In-Reply-To: <20251216092147.2326606-3-jarkko@kernel.org>
On Tue, Dec 16, 2025 at 11:21:36AM +0200, Jarkko Sakkinen wrote:
>Substitute remaining tpm_get_random() calls in trusted_tpm1.c with
>get_random_bytes_wait() thus aligning random number generation for TPM 1.2
>with the removal of '.get_random' callback.
Had to double check we wouldn't end up not getting all the randomness we
ask for, but get_random_bytes_wait does indeed DTRT.
Reviewed-by: Jonathan McDowell <noodles@meta.com>
>Cc: Eric Biggers <ebiggers@kernel.org>
>Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
>---
> security/keys/trusted-keys/trusted_tpm1.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
>diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
>index 7ce7e31bcdfb..3d75bb6f9689 100644
>--- a/security/keys/trusted-keys/trusted_tpm1.c
>+++ b/security/keys/trusted-keys/trusted_tpm1.c
>@@ -371,13 +371,10 @@ static int osap(struct tpm_buf *tb, struct osapsess *s,
> unsigned char ononce[TPM_NONCE_SIZE];
> int ret;
>
>- ret = tpm_get_random(chip, ononce, TPM_NONCE_SIZE);
>+ ret = get_random_bytes_wait(ononce, TPM_NONCE_SIZE);
> if (ret < 0)
> return ret;
>
>- if (ret != TPM_NONCE_SIZE)
>- return -EIO;
>-
> tpm_buf_reset(tb, TPM_TAG_RQU_COMMAND, TPM_ORD_OSAP);
> tpm_buf_append_u16(tb, type);
> tpm_buf_append_u32(tb, handle);
>@@ -464,15 +461,10 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
> memcpy(td->xorwork + SHA1_DIGEST_SIZE, sess.enonce, SHA1_DIGEST_SIZE);
> sha1(td->xorwork, SHA1_DIGEST_SIZE * 2, td->xorhash);
>
>- ret = tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE);
>+ ret = get_random_bytes_wait(td->nonceodd, TPM_NONCE_SIZE);
> if (ret < 0)
> goto out;
>
>- if (ret != TPM_NONCE_SIZE) {
>- ret = -EIO;
>- goto out;
>- }
>-
> ordinal = htonl(TPM_ORD_SEAL);
> datsize = htonl(datalen);
> pcrsize = htonl(pcrinfosize);
>@@ -575,14 +567,10 @@ static int tpm_unseal(struct tpm_buf *tb,
> }
>
> ordinal = htonl(TPM_ORD_UNSEAL);
>- ret = tpm_get_random(chip, nonceodd, TPM_NONCE_SIZE);
>+ ret = get_random_bytes_wait(nonceodd, TPM_NONCE_SIZE);
> if (ret < 0)
> return ret;
>
>- if (ret != TPM_NONCE_SIZE) {
>- pr_info("tpm_get_random failed (%d)\n", ret);
>- return -EIO;
>- }
> ret = TSS_authhmac(authdata1, keyauth, TPM_NONCE_SIZE,
> enonce1, nonceodd, cont, sizeof(uint32_t),
> &ordinal, bloblen, blob, 0, 0);
>--
>2.39.5
>
>
J.
--
Web [ Avoid temporary variables and strange women. ]
site: https:// [ ] Made by
www.earth.li/~noodles/ [ ] HuggieTag 0.0.24
next prev parent reply other threads:[~2025-12-19 9:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-16 9:21 [PATCH v8 00/12] Streamline TPM2 HMAC sessions Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 01/12] KEYS: trusted: Use get_random-fallback for TPM Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 02/12] KEYS: trusted: Use get_random_bytes_wait() instead of tpm_get_random() Jarkko Sakkinen
2025-12-19 9:21 ` Jonathan McDowell [this message]
2025-12-16 9:21 ` [PATCH v8 03/12] tpm: Orchestrate TPM commands in tpm_get_random() Jarkko Sakkinen
2025-12-19 9:43 ` Jonathan McDowell
2025-12-16 9:21 ` [PATCH v8 04/12] tpm: Change tpm_get_random() opportunistic Jarkko Sakkinen
2025-12-16 22:03 ` Jarkko Sakkinen
2025-12-19 9:42 ` Jonathan McDowell
2025-12-16 9:21 ` [PATCH v8 05/12] tpm2-sessions: Define TPM2_NAME_MAX_SIZE Jarkko Sakkinen
2025-12-19 9:32 ` Jonathan McDowell
2025-12-16 9:21 ` [PATCH v8 06/12] KEYS: trusted: Open code tpm2_buf_append() Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 07/12] KEYS: trusted: Remove dead branch from tpm2_unseal_cmd Jarkko Sakkinen
2025-12-19 9:37 ` Jonathan McDowell
2025-12-19 20:54 ` James Bottomley
2025-12-16 9:21 ` [PATCH v8 08/12] KEYS: trusted: Re-orchestrate tpm2_read_public() calls Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 09/12] tpm2-sessions: Remove the support for more than one authorization Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 10/12] tpm-buf: Remove tpm_buf_append_handle Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 11/12] tpm-buf: Merge TPM_BUF_BOUNDARY_ERROR and TPM_BUF_OVERFLOW Jarkko Sakkinen
2025-12-16 9:21 ` [PATCH v8 12/12] tpm-buf: Implement managed allocations 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=aUUZKu2xaZvEdq-2@earth.li \
--to=noodles@earth.li \
--cc=James.Bottomley@hansenpartnership.com \
--cc=dhowells@redhat.com \
--cc=ebiggers@kernel.org \
--cc=jarkko@kernel.org \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/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;
as well as URLs for NNTP newsgroup(s).