From: Stefan Berger Date: Wed, 15 Feb 2017 16:56:23 +0000 (-0500) Subject: tpm: Fix expected number of response bytes of TPM1.2 PCR Extend X-Git-Tag: v4.11-rc1~138^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51b0be640cf6e2cb63a7cf4d9c7c4acd3ad5afd0;p=karo-tx-linux.git tpm: Fix expected number of response bytes of TPM1.2 PCR Extend The TPM1.2 PCR Extend operation only returns 20 bytes in the body, which is the size of the PCR state. This fixes a problem where IMA gets errors with every PCR Extend. Fixes: c659af78eb7b ("tpm: Check size of response before accessing data") Signed-off-by: Stefan Berger Acked-by: Mimi Zohar Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen --- diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 6e368ee7bbec..bd2128e0b56c 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -767,7 +767,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); #define TPM_ORD_PCR_EXTEND cpu_to_be32(20) #define EXTEND_PCR_RESULT_SIZE 34 -#define EXTEND_PCR_RESULT_BODY_SIZE 24 +#define EXTEND_PCR_RESULT_BODY_SIZE 20 static const struct tpm_input_header pcrextend_header = { .tag = TPM_TAG_RQU_COMMAND, .length = cpu_to_be32(34),