Re: [PATCH v3 1/5] tpm2-sessions: Drop TPM2_NAME_SIZE

From: Jonathan McDowell

Date: Mon Nov 16 2026 - 04:44:06 EST


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@xxxxxxxxxxxxxxx # v7.3+
> Fixes: 88c5a62c3af7 ("tpm: Move TPM common base definitions to the command header")
> Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>

Reviewed-by: Jonathan McDowell <noodles@xxxxxxxx>

> ---
> 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.