TPM: fix pcrread
PATCH 1/1 TPM: fix pcrread
The previously sent patch:
http://marc.info/?l=tpmdd-devel&m=125208945007834&w=2
Had its first hunk cropped when merged, submitting only this first hunk again.
Signed-off-by Jason Gunthorpe <[email protected]>
Cc Debora Velarde <[email protected]>
Cc Marcel Selhorst <[email protected]>
Cc James Morris <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Rajiv Andrade <[email protected]>
--- drivers/char/tpm/tpm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/char/tpm/tpm.c +1 -2
@@ -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 )
Signature · 1 line
1.6.3.1
Quoted 22 lines · Rajiv Andrade
The previously sent patch:
http://marc.info/?l=tpmdd-devel&m=125208945007834&w=2
Had its first hunk cropped when merged, submitting only this first hunk again.
Signed-off-by Jason Gunthorpe <[email protected]>Cc Debora Velarde <[email protected]>Cc Marcel Selhorst <[email protected]>Cc James Morris <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Rajiv Andrade <[email protected]>--- drivers/char/tpm/tpm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)drivers/char/tpm/tpm.c +0
-0
drivers/char/tpm/tpm.c int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) · line 702
Quoted 9 lines
drivers/char/tpm/tpm.c +1
-2@@ -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 )
Compiled and tested patch.
Acked-by Mimi Zohar <[email protected]>
Quoted 9 lines · Mimi Zohar
drivers/char/tpm/tpm.c int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) · line 702
Quoted 4 lines · Rajiv Andrade
drivers/char/tpm/tpm.c +1
-0+ rc =transmit_cmd (chip, &cmd,READ_PCR_RESULT_SIZE ,"attempting to read a pcr value" );if (rc ==0 )Compiled and tested patch.
Acked-by Mimi Zohar <[email protected]>
Thanks.
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 1 line
James Morris <[email protected]>