Skip to content

Commit 5cc4671

Browse files
committed
Merge tag 'tpmdd-next-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull TPM fixes from Jarkko Sakkinen: "This contains the fixes for !chip->auth condition, preventing the breakage of: - tpm_ftpm_tee.c - tpm_i2c_nuvoton.c - tpm_ibmvtpm.c - tpm_tis_i2c_cr50.c - tpm_vtpm_proxy.c All drivers will continue to work as they did in 6.9, except a single warning (dev_warn() not WARN()) is printed to klog only to inform that authenticated sessions are not enabled" * tag 'tpmdd-next-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd: tpm: Address !chip->auth in tpm_buf_append_hmac_session*() tpm: Address !chip->auth in tpm_buf_append_name() tpm: Address !chip->auth in tpm2_*_auth_session()
2 parents 75aa87c + 7ca110f commit 5cc4671

File tree

3 files changed

+269
-233
lines changed

3 files changed

+269
-233
lines changed

drivers/char/tpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ tpm-y += eventlog/common.o
1616
tpm-y += eventlog/tpm1.o
1717
tpm-y += eventlog/tpm2.o
1818
tpm-y += tpm-buf.o
19+
tpm-y += tpm2-sessions.o
1920

20-
tpm-$(CONFIG_TCG_TPM2_HMAC) += tpm2-sessions.o
2121
tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o
2222
tpm-$(CONFIG_EFI) += eventlog/efi.o
2323
tpm-$(CONFIG_OF) += eventlog/of.o

0 commit comments

Comments
 (0)