From: Jarkko Sakkinen <jarkko@kernel.org>
To: Peter Huewe <peterhuewe@gmx.de>,
Jarkko Sakkinen <jarkko@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: x86@kernel.org, "Daniel P. Smith" <dpsmith@apertussolutions.com>,
Ross Philipson <ross.philipson@oracle.com>,
Ard Biesheuvel <ardb@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER),
linux-kernel@vger.kernel.org (open list)
Subject: [RFC PATCH 2/4] tpm, tpm_tis: Address positive localities in tpm_tis_request_locality()
Date: Sat, 2 Nov 2024 17:22:19 +0200 [thread overview]
Message-ID: <20241102152226.2593598-3-jarkko@kernel.org> (raw)
In-Reply-To: <20241102152226.2593598-1-jarkko@kernel.org>
From: "Daniel P. Smith" <dpsmith@apertussolutions.com>
Validate that the input locality is within the correct range, as specified
by TCG standards, and increase the locality count also for the positive
localities.
Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
drivers/char/tpm/tpm_tis_core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index c58f360fb4a4..c86100ad743a 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -234,10 +234,13 @@ static int tpm_tis_request_locality(struct tpm_chip *chip, int l)
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
int ret = 0;
+ if (l < 0 || l > TPM_MAX_LOCALITY)
+ return -EINVAL;
+
mutex_lock(&priv->locality_count_mutex);
if (priv->locality_count == 0)
ret = __tpm_tis_request_locality(chip, l);
- if (!ret)
+ if (ret >= 0)
priv->locality_count++;
mutex_unlock(&priv->locality_count_mutex);
return ret;
--
2.47.0
next prev parent reply other threads:[~2024-11-02 15:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-02 15:22 [RFC PATCH 0/4] Alternative TPM patches for Trenchboot Jarkko Sakkinen
2024-11-02 15:22 ` [RFC PATCH 1/4] tpm, tpm_tis: Close all localities Jarkko Sakkinen
2024-11-02 15:22 ` Jarkko Sakkinen [this message]
2024-11-02 15:22 ` [RFC PATCH 3/4] tpm, tpm_tis: allow to set locality to a different value Jarkko Sakkinen
2024-11-02 15:22 ` [RFC PATCH 4/4] tpm: sysfs: Show locality used by kernel Jarkko Sakkinen
2024-11-02 18:00 ` [RFC PATCH 0/4] Alternative TPM patches for Trenchboot Jarkko Sakkinen
2024-11-04 10:57 ` Daniel P. Smith
2024-11-04 11:18 ` Jarkko Sakkinen
2024-11-04 11:19 ` Jarkko Sakkinen
2024-11-04 11:29 ` Jarkko Sakkinen
2024-11-04 11:27 ` Ard Biesheuvel
2024-11-04 11:47 ` Jarkko Sakkinen
2024-11-04 11:52 ` Daniel P. Smith
2024-11-04 11:55 ` Ard Biesheuvel
2024-11-04 12:06 ` Jarkko Sakkinen
2024-11-04 12:19 ` Daniel P. Smith
2024-11-04 13:21 ` James Bottomley
2024-11-04 16:34 ` Daniel P. Smith
2024-11-04 20:36 ` James Bottomley
2024-11-05 0:13 ` Daniel P. Smith
2024-11-04 15:03 ` Jarkko Sakkinen
2024-11-04 20:40 ` ross.philipson
2024-11-05 0:51 ` ross.philipson
2024-11-05 16:24 ` Ard Biesheuvel
2024-11-05 18:21 ` ross.philipson
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=20241102152226.2593598-3-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=ardb@kernel.org \
--cc=dpsmith@apertussolutions.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=ross.philipson@oracle.com \
--cc=tglx@linutronix.de \
--cc=x86@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