From: Jonathan McDowell <noodles@earth.li>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
Alec Brown <alec.r.brown@oracle.com>,
"Daniel P. Smith" <dpsmith@apertussolutions.com>,
David Howells <dhowells@redhat.com>,
Eric Biggers <ebiggers@kernel.org>,
James Bottomley <James.Bottomley@hansenpartnership.com>,
James Morris <jmorris@namei.org>, Jason Gunthorpe <jgg@ziepe.ca>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Mimi Zohar <zohar@linux.ibm.com>,
Paul Moore <paul@paul-moore.com>, Peter Huewe <peterhuewe@gmx.de>,
Roberto Sassu <roberto.sassu@huawei.com>,
Ross Philipson <ross.philipson@gmail.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
stable@vger.kernel.org
Subject: Re: [PATCH v3 1/5] tpm2-sessions: Drop TPM2_NAME_SIZE
Date: Mon, 16 Nov 2026 09:43:40 +0000 [thread overview]
Message-ID: <avrQTPj-iwlrUvcp@earth.li> (raw)
In-Reply-To: <20261116005105.1573016-2-jarkko@kernel.org>
On Mon, Nov 16, 2026 at 02:51:00AM +0200, Jarkko Sakkinen wrote:
> TPM2_NAME_SIZE was left to include/linux/tpm.h when the base definitions
> were consolidated. Switch struct tpm2_auth to TPM2_MAX_NAME_SIZE and
> convert TPM2_NAME_SIZE users to TPM2_NULL_NAME_SIZE, removing the
> redundant TPM2_NAME_SIZE definition.
>
> Cc: stable@vger.kernel.org # v7.3+
> Fixes: 88c5a62c3af7 ("tpm: Move TPM common base definitions to the command header")
> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Jonathan McDowell <noodles@meta.com>
> ---
> drivers/char/tpm/tpm-sysfs.c | 2 +-
> drivers/char/tpm/tpm2-sessions.c | 2 +-
> include/linux/tpm.h | 8 +-------
> 3 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
> index d915307ae833..0f726cf65189 100644
> --- a/drivers/char/tpm/tpm-sysfs.c
> +++ b/drivers/char/tpm/tpm-sysfs.c
> @@ -318,7 +318,7 @@ 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;
> + int size = TPM2_NULL_NAME_SIZE;
>
> bin2hex(buf, chip->null_key_name, size);
> size *= 2;
> diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
> index 9608e545602c..94c11135beb3 100644
> --- a/drivers/char/tpm/tpm2-sessions.c
> +++ b/drivers/char/tpm/tpm2-sessions.c
> @@ -137,7 +137,7 @@ struct tpm2_auth {
> * we must compute and remember
> */
> u32 name_h[AUTH_MAX_NAMES];
> - u8 name[AUTH_MAX_NAMES][2 + SHA512_DIGEST_SIZE];
> + u8 name[AUTH_MAX_NAMES][TPM2_MAX_NAME_SIZE];
> };
>
> #ifdef CONFIG_TCG_TPM2_HMAC
> diff --git a/include/linux/tpm.h b/include/linux/tpm.h
> index 0db277af45c3..84c8fe226235 100644
> --- a/include/linux/tpm.h
> +++ b/include/linux/tpm.h
> @@ -94,12 +94,6 @@ struct tpm_chip_seqops {
> /* Fixed define for the curve we use which is NIST_P256 */
> #define EC_PT_SZ 32
>
> -/*
> - * fixed define for the size of a name. This is actually HASHALG size
> - * plus 2, so 32 for SHA256
> - */
> -#define TPM2_NAME_SIZE 34
> -
> /*
> * The maximum size for an object context
> */
> @@ -166,7 +160,7 @@ struct tpm_chip {
> /* saved context for NULL seed */
> u8 null_key_context[TPM2_MAX_CONTEXT_SIZE];
> /* name of NULL seed */
> - u8 null_key_name[TPM2_NAME_SIZE];
> + u8 null_key_name[TPM2_NULL_NAME_SIZE];
> u8 null_ec_key_x[EC_PT_SZ];
> u8 null_ec_key_y[EC_PT_SZ];
> struct tpm2_auth *auth;
> --
> 2.47.3
>
J.
--
... I am afraid of the dark.
next prev parent reply other threads:[~2026-11-16 9:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 0:50 [PATCH v3 0/5] Unsorted tpm2-sessions improvements Jarkko Sakkinen
2026-11-16 0:51 ` [PATCH v3 1/5] tpm2-sessions: Drop TPM2_NAME_SIZE Jarkko Sakkinen
2026-11-16 0:55 ` sashiko-bot
2026-11-16 9:43 ` Jonathan McDowell [this message]
2026-11-16 9:53 ` Jarkko Sakkinen
2026-11-16 0:51 ` [PATCH v3 2/5] KEYS: trusted: Open code tpm2_buf_append_auth() Jarkko Sakkinen
2026-11-16 0:56 ` sashiko-bot
2026-11-16 0:51 ` [PATCH v3 3/5] KEYS: trusted: Remove dead branch from tpm2_unseal_cmd Jarkko Sakkinen
2026-11-16 0:56 ` sashiko-bot
2026-11-16 0:51 ` [PATCH v3 4/5] tpm2-sessions: Re-orchestrate tpm2_read_public() use Jarkko Sakkinen
2026-11-16 0:58 ` sashiko-bot
2026-11-16 0:51 ` [PATCH v3 5/5] tpm-buf: Make tpm_buf_read*() fallible Jarkko Sakkinen
2026-11-16 1:09 ` sashiko-bot
2026-11-16 1:29 ` 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=avrQTPj-iwlrUvcp@earth.li \
--to=noodles@earth.li \
--cc=James.Bottomley@hansenpartnership.com \
--cc=alec.r.brown@oracle.com \
--cc=dhowells@redhat.com \
--cc=dpsmith@apertussolutions.com \
--cc=ebiggers@kernel.org \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--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=mjg59@srcf.ucam.org \
--cc=paul@paul-moore.com \
--cc=peterhuewe@gmx.de \
--cc=roberto.sassu@huawei.com \
--cc=ross.philipson@gmail.com \
--cc=serge@hallyn.com \
--cc=stable@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.