Commit f9e6e6d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'keys-trusted-next-6.19-rc7' of... 

Merge tag 'keys-trusted-next-6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull keys fix from Jarkko Sakkinen.

* tag 'keys-trusted-next-6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  keys/trusted_keys: fix handle passed to tpm_buf_append_name during unseal
parents 0a6dce0a 6342969d

security/keys/trusted-keys/trusted_tpm2.c

+2 −2
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip, 
}



/**

 * 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;