diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:30:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 16:30:50 -0400 |
| commit | 7f3143702cc0d433c183d7b361b1316f2dcf8464 (patch) | |
| tree | 8454228d61b73d3a57c0717e667e2d94e692d04f | |
| parent | 4047df09a1581284218cb378208a87eaa36f2d2c (diff) | |
| parent | 15d031c394e7bef9da4ec764e6b0330d701a0126 (diff) | |
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
| -rw-r--r-- | drivers/char/tpm/tpm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 45d58002b06c..47c2d2763456 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
| @@ -696,8 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) | |||
| 696 | 696 | ||
| 697 | cmd.header.in = pcrread_header; | 697 | cmd.header.in = pcrread_header; |
| 698 | cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx); | 698 | cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx); |
| 699 | BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE); | 699 | rc = transmit_cmd(chip, &cmd, READ_PCR_RESULT_SIZE, |
| 700 | rc = transmit_cmd(chip, &cmd, cmd.header.in.length, | ||
| 701 | "attempting to read a pcr value"); | 700 | "attempting to read a pcr value"); |
| 702 | 701 | ||
| 703 | if (rc == 0) | 702 | if (rc == 0) |