[PATCH v3 04/10] tpm2-sessions: Remove 'attributes' from tpm_buf_append_auth

[Jonathan McDowell]

On Mon, Sep 29, 2025 at 10:48:26PM +0300, Jarkko Sakkinen wrote:
> From: Jarkko Sakkinen <jarkko.sakkinen at opinsys.com>
> 
> In a previous bug fix, 'attributes' was added by mistake to
> tpm_buf_append_auth(). Remove the parameter.
> 
> Fixes: 27184f8905ba ("tpm: Opt-in in disable PCR integrity protection")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen at opinsys.com>

Reviewed-by: Jonathan McDowell <noodles at meta.com>

> ---
> v3:
> - No changes
> v2:
> - Uncorrupt the patch.
> ---
>  drivers/char/tpm/tpm2-cmd.c      | 2 +-
>  drivers/char/tpm/tpm2-sessions.c | 5 ++---
>  include/linux/tpm.h              | 2 +-
>  3 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> index a7cddd4b5626..86b1a4d859b9 100644
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@ -191,7 +191,7 @@ int tpm2_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,
>  		tpm_buf_append_hmac_session(chip, &buf, 0, NULL, 0);
>  	} else {
>  		tpm_buf_append_handle(chip, &buf, pcr_idx);
> -		tpm_buf_append_auth(chip, &buf, 0, NULL, 0);
> +		tpm_buf_append_auth(chip, &buf, NULL, 0);
>  	}
>  
>  	tpm_buf_append_u32(&buf, chip->nr_allocated_banks);
> diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c
> index 6d03c224e6b2..13f019d1312a 100644
> --- a/drivers/char/tpm/tpm2-sessions.c
> +++ b/drivers/char/tpm/tpm2-sessions.c
> @@ -266,7 +266,7 @@ void tpm_buf_append_name(struct tpm_chip *chip, struct tpm_buf *buf,
>  EXPORT_SYMBOL_GPL(tpm_buf_append_name);
>  
>  void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf,
> -			 u8 attributes, u8 *passphrase, int passphrase_len)
> +			 u8 *passphrase, int passphrase_len)
>  {
>  	/* offset tells us where the sessions area begins */
>  	int offset = buf->handles * 4 + TPM_HEADER_SIZE;
> @@ -327,8 +327,7 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf,
>  #endif
>  
>  	if (!tpm2_chip_auth(chip)) {
> -		tpm_buf_append_auth(chip, buf, attributes, passphrase,
> -				    passphrase_len);
> +		tpm_buf_append_auth(chip, buf, passphrase, passphrase_len);
>  		return;
>  	}
>  
> diff --git a/include/linux/tpm.h b/include/linux/tpm.h
> index 51846317d662..1fa02e18e688 100644
> --- a/include/linux/tpm.h
> +++ b/include/linux/tpm.h
> @@ -531,7 +531,7 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf,
>  				 u8 attributes, u8 *passphrase,
>  				 int passphraselen);
>  void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf,
> -			 u8 attributes, u8 *passphrase, int passphraselen);
> +			 u8 *passphrase, int passphraselen);
>  static inline void tpm_buf_append_hmac_session_opt(struct tpm_chip *chip,
>  						   struct tpm_buf *buf,
>  						   u8 attributes,
> -- 
> 2.39.5
> 
> 

J.

-- 
   101 things you can't have too   |  .''`.  Debian GNU/Linux Developer
       much of : 17 - Money.       | : :' :  Happy to accept PGP signed
                                   | `. `'   or encrypted mail - RSA
                                   |   `-    key on the keyservers.