From: Mario Limonciello <mario.limonciello@amd.com>
To: <peterhuewe@gmx.de>, <jarkko@kernel.org>, <jgg@ziepe.ca>
Cc: <linux-integrity@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Mario Limonciello" <mario.limonciello@amd.com>,
Linux regressions mailing list <regressions@lists.linux.dev>,
"Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
Sachin Sant <sachinp@linux.ibm.com>
Subject: [PATCH] tpm: Ensure that tpm chip has ops to check if it's defective
Date: Thu, 22 Jun 2023 22:04:27 -0500 [thread overview]
Message-ID: <20230623030427.908-1-mario.limonciello@amd.com> (raw)
The ibmvtpm doesn't have `chip->ops` set, and so trying to check
if it's a defective AMD fTPM doesn't work.
Add an extra check to tpm_amd_is_rng_defective() to ensure the
TPM being checked has `chip->ops`.
Cc: Linux regressions mailing list <regressions@lists.linux.dev>
Reported-by: Aneesh Kumar K. V <aneesh.kumar@linux.ibm.com>
Reported-by: Sachin Sant <sachinp@linux.ibm.com>
Link: https://lore.kernel.org/lkml/99B81401-DB46-49B9-B321-CF832B50CAC3@linux.ibm.com/
Tested-by: Sachin Sant <sachinp@linux.ibm.com>
Fixes: bd8621ca1510 ("tpm: Add !tpm_amd_is_rng_defective() to the hwrng_unregister() call site")
Fixes: f1324bbc4011 ("tpm: disable hwrng for fTPM on some AMD designs")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/char/tpm/tpm-chip.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index cd48033b804a..9ba433761e9a 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -524,6 +524,9 @@ static bool tpm_amd_is_rng_defective(struct tpm_chip *chip)
u64 version;
int ret;
+ if (!chip->ops)
+ return false;
+
if (!(chip->flags & TPM_CHIP_FLAG_TPM2))
return false;
--
2.34.1
next reply other threads:[~2023-06-23 3:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 3:04 Mario Limonciello [this message]
2023-06-23 6:08 ` [PATCH] tpm: Ensure that tpm chip has ops to check if it's defective Greg KH
2023-06-23 13:42 ` Limonciello, Mario
2023-06-29 21:58 ` Limonciello, Mario
2023-06-30 2:08 ` Jarkko Sakkinen
2023-06-30 2:31 ` Limonciello, Mario
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=20230623030427.908-1-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=regressions@lists.linux.dev \
--cc=sachinp@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