Commit 7f314370 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  TPM: fix pcrread
parents 4047df09 15d031c3

drivers/char/tpm/tpm.c

+1 −2
Original line number Diff line number Diff line
@@ -696,8 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) 


	cmd.header.in = pcrread_header;

	cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);

	BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);

	rc = transmit_cmd(chip, &cmd, cmd.header.in.length,

	rc = transmit_cmd(chip, &cmd, READ_PCR_RESULT_SIZE,

			  "attempting to read a pcr value");



	if (rc == 0)