Commit 32d380a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-v5.19-rc2-v2' of... 

Merge tag 'tpmdd-next-v5.19-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fix from Jarkko Sakkinen:
 "A bug fix for migratable (whether or not a key is tied to the TPM chip
  soldered to the machine) handling for TPM2 trusted keys"

* tag 'tpmdd-next-v5.19-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: tpm2: Fix migratable logic
parents 9886142c dda53843

security/keys/trusted-keys/trusted_tpm2.c

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ int tpm2_seal_trusted(struct tpm_chip *chip, 
	/* key properties */

	flags = 0;

	flags |= options->policydigest_len ? 0 : TPM2_OA_USER_WITH_AUTH;

	flags |= payload->migratable ? (TPM2_OA_FIXED_TPM |

					TPM2_OA_FIXED_PARENT) : 0;

	flags |= payload->migratable ? 0 : (TPM2_OA_FIXED_TPM |

					    TPM2_OA_FIXED_PARENT);

	tpm_buf_append_u32(&buf, flags);



	/* policy */