Skip to content

Commit 6342969

Browse files
ssrish17jarkkojs
authored andcommitted
keys/trusted_keys: fix handle passed to tpm_buf_append_name during unseal
TPM2_Unseal[1] expects the handle of a loaded data object, and not the handle of the parent key. But the tpm2_unseal_cmd provides the parent keyhandle instead of blob_handle for the session HMAC calculation. This causes unseal to fail. Fix this by passing blob_handle to tpm_buf_append_name(). References: [1] trustedcomputinggroup.org/wp-content/uploads/ Trusted-Platform-Module-2.0-Library-Part-3-Version-184_pub.pdf Fixes: 6e9722e ("tpm2-sessions: Fix out of range indexing in name_size") Signed-off-by: Srish Srinivasan <ssrish@linux.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent d91a46d commit 6342969

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

security/keys/trusted-keys/trusted_tpm2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip,
465465
}
466466

467467
/**
468-
* tpm2_unseal_cmd() - execute a TPM2_Unload command
468+
* tpm2_unseal_cmd() - execute a TPM2_Unseal command
469469
*
470470
* @chip: TPM chip to use
471471
* @payload: the key data in clear and encrypted form
@@ -498,7 +498,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,
498498
return rc;
499499
}
500500

501-
rc = tpm_buf_append_name(chip, &buf, options->keyhandle, NULL);
501+
rc = tpm_buf_append_name(chip, &buf, blob_handle, NULL);
502502
if (rc)
503503
goto out;
504504

0 commit comments

Comments
 (0)