Re: [PATCH] TPM: fix pcrread

From: Mimi Zohar
Date: Wed Sep 30 2009 - 16:27:19 EST


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 <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
> Cc: Debora Velarde <debora@xxxxxxxxxxxxxxxxxx>
> Cc: Marcel Selhorst <m.selhorst@xxxxxxxxxx>
> Cc: James Morris <jmorris@xxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
> ---
> 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 <zohar@xxxxxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/