sugar/linux
1
0
Fork 0
Code Activity

tpm2-sessions: Remove 'attributes' parameter from tpm_buf_append_auth

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

Fixes: 27184f8905 ("tpm: Opt-in in disable PCR integrity protection")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@opinsys.com>
Reviewed-by: Jonathan McDowell <noodles@meta.com>
This commit is contained in:
Jarkko Sakkinen
2025-09-30 16:07:35 +03:00
committed by Jarkko Sakkinen
parent bda1cbf73c
commit bc677a9216
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/tpm/tpm2-cmd.c
View File

@@ -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); tpm_buf_append_hmac_session(chip, &buf, 0, NULL, 0);
} else { } else {
tpm_buf_append_handle(chip, &buf, pcr_idx); 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); tpm_buf_append_u32(&buf, chip->nr_allocated_banks);

5
drivers/char/tpm/tpm2-sessions.c
View File

@@ -311,7 +311,7 @@ err:
EXPORT_SYMBOL_GPL(tpm_buf_append_name); EXPORT_SYMBOL_GPL(tpm_buf_append_name);
void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf, 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 */ /* offset tells us where the sessions area begins */
int offset = buf->handles * 4 + TPM_HEADER_SIZE; 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 #endif
if (!tpm2_chip_auth(chip)) { if (!tpm2_chip_auth(chip)) {
tpm_buf_append_auth(chip, buf, attributes, passphrase, tpm_buf_append_auth(chip, buf, passphrase, passphrase_len);
passphrase_len);
return; return;
} }

2
include/linux/tpm.h
View File

@@ -535,7 +535,7 @@ void tpm_buf_append_hmac_session(struct tpm_chip *chip, struct tpm_buf *buf,
u8 attributes, u8 *passphrase, u8 attributes, u8 *passphrase,
int passphraselen); int passphraselen);
void tpm_buf_append_auth(struct tpm_chip *chip, struct tpm_buf *buf, 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, static inline void tpm_buf_append_hmac_session_opt(struct tpm_chip *chip,
struct tpm_buf *buf, struct tpm_buf *buf,
u8 attributes, u8 attributes,