tpm2-sessions: Remove 'attributes' parameter from tpm_buf_append_auth

Remove 'attributes' parameter from 'tpm_buf_append_auth', as it is not used
by the function.

Fixes: 27184f8905ba ("tpm: Opt-in in disable PCR integrity protection")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@opinsys.com>
Reviewed-by: Jonathan McDowell <noodles@meta.com>

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 34e3599f094f3bea5aec998f56d2a05b2ba1f33f..ce0a1c6b05968297cbb44e73c3ff32613e8a7add 100644 (file)
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -210,7 +210,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 3f389e2f6f580b58a4e7e5754f0c8ad7fadb9c67..4149379665c49d2642f5a895d95b4d3eed86e7e1 100644 (file)
--- a/drivers/char/tpm/tpm2-sessions.c
+++ b/drivers/char/tpm/tpm2-sessions.c
@@ -311,7 +311,7 @@ err:
 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;
@@ -372,8 +372,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 aa816b144ab3e02b57ee4d174ada8540d15449bb..afa51723296a71100e07ad7665b102cf172f60b5 100644 (file)
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -535,7 +535,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,