Merge tag 'for-next-keys-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

8552019d · Linus Torvalds <[email protected]> · 2026-08-23 08:29:33 -07:00

Pull TPM update from Jarkko Sakkinen:
 "Just a single bug fix"

* tag 'for-next-keys-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: Fix TPM teardown ordering

Commit: 8552019d09867164a6350bda7d731f140a90d7ac
Parents: e5f92606 · 5e2d6722

Merge commit. Changes below are compared with the first parent: e5f92606.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
security/keys/trusted-keys/trusted_tpm1.c	modified	+1	−1	View file

security/keys/trusted-keys/trusted_tpm1.c

View file

diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
index 1351381..8f57c61 100644
--- a/security/keys/trusted-keys/trusted_tpm1.c
+++ b/security/keys/trusted-keys/trusted_tpm1.c
@@ -987,9 +987,9 @@ err_put:
 static void trusted_tpm_exit(void)
 {
 	if (chip) {
+		unregister_key_type(&key_type_trusted);
 		put_device(&chip->dev);
 		kfree(digests);
-		unregister_key_type(&key_type_trusted);
 	}
 }
 