From: Eric Biggers <ebiggers@kernel.org>
To: Peter Huewe <peterhuewe@gmx.de>,
Jarkko Sakkinen <jarkko@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>,
James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org,
Eric Biggers <ebiggers@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH] tpm: Check return value of crypto_kpp_set_secret()
Date: Sun, 25 Oct 2026 14:11:19 -0700 [thread overview]
Message-ID: <20261025211119.138277-1-ebiggers@kernel.org> (raw)
crypto_kpp_set_secret() can fail, for example if the kernel is booted
with fips=1 and the broken-by-design FIPS RNG used for ECC private key
generation doesn't feel like generating random bytes at the moment.
Check for error, cancelling the TPM session creation rather than
proceeding with a zero or uninitialized private key.
Fixes: 699e3efd6c64 ("tpm: Add HMAC session start and end functions")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
drivers/char/tpm/tpm2-sessions.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
index ca1e2bf424e14..2aaaad69760dc 100644
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -527,7 +527,9 @@ static int tpm_buf_append_salt(struct tpm_buf *buf, struct tpm_chip *chip,
}
crypto_ecdh_encode_key(encoded_key, buf_len, &p);
/* this generates a random private key */
- crypto_kpp_set_secret(kpp, encoded_key, buf_len);
+ rc = crypto_kpp_set_secret(kpp, encoded_key, buf_len);
+ if (rc)
+ goto err_free_kpp;
/* salt is now the public point of this private key */
req = kpp_request_alloc(kpp, GFP_KERNEL);
base-commit: 21a7f44fd0765fcc5194130b28767786eba1d1e7
--
2.56.0
next reply other threads:[~2026-10-25 21:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-25 21:11 Eric Biggers [this message]
2026-10-25 22:12 ` [PATCH] tpm: Check return value of crypto_kpp_set_secret() Jarkko Sakkinen
2026-10-25 22:47 ` Eric Biggers
2026-10-25 23:11 ` Jarkko Sakkinen
2026-10-25 23:28 ` Jarkko Sakkinen
2026-10-25 23:40 ` Eric Biggers
2026-10-26 0:32 ` 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=20261025211119.138277-1-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=stable@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