2009-09-30 15:27:17

by Rajiv Andrade

Subject: [PATCH] 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(-)

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 45d5800..47c2d27 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)

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)
--
1.6.3.1

2009-09-30 20:27:10

by Mimi Zohar

Subject: Re: [PATCH] TPM: fix pcrread

On Wed, 2009-09-30 at 12:26 -0300, Rajiv Andrade wrote:
> 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(-)
>
> diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
> index 45d5800..47c2d27 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)
>
> 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]>

2009-09-30 22:33:01

by James Morris

Subject: Re: [PATCH] TPM: fix pcrread

On Wed, 30 Sep 2009, Mimi Zohar wrote:

> On Wed, 2009-09-30 at 12:26 -0300, Rajiv Andrade wrote:
> > + 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 to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

--
James Morris <[email protected]>