diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-01-26 17:03:53 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-01-26 17:03:53 -0300 |
| commit | d3b402c5a2d47f51eb0581da1a7b142f82cb10d1 (patch) | |
| tree | cf5b202147ca9d061067f87339450834aa25a7f0 /security/keys | |
| parent | 3d06db9bad1ad8e67c3981964cfba224c07fc306 (diff) | |
| parent | fcb70a56f4d81450114034b2c61f48ce7444a0e2 (diff) | |
| download | linux-next-d3b402c5a2d47f51eb0581da1a7b142f82cb10d1.tar.gz linux-next-d3b402c5a2d47f51eb0581da1a7b142f82cb10d1.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
Merge with upstream to pick up fixes from perf-tools and from other
tools/ parts that interact with tools/perf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/trusted-keys/trusted_tpm2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index a7ea4a1c3bed..6340823f8b53 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -465,7 +465,7 @@ out: } /** - * tpm2_unseal_cmd() - execute a TPM2_Unload command + * tpm2_unseal_cmd() - execute a TPM2_Unseal command * * @chip: TPM chip to use * @payload: the key data in clear and encrypted form @@ -498,7 +498,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip, return rc; } - rc = tpm_buf_append_name(chip, &buf, options->keyhandle, NULL); + rc = tpm_buf_append_name(chip, &buf, blob_handle, NULL); if (rc) goto out; |