tpm: Change response length of tpm2_get_capability()

For implementing the EFI_TCG2_PROTOCOL we need the count field returned by
the TPM when reading capabilities via tpm2_get_capability().

Adjust the implementation of the 'tpm2 get_capability' command accordingly.

Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c
index e6742656f5788d7146f10b799b419e96ef29bd0e..5fa4788a72de5199f00d27d415e15bdecf6b145e 100644 (file)
--- a/cmd/tpm-v2.c
+++ b/cmd/tpm-v2.c
@@ -191,10 +191,10 @@ static int do_tpm_get_capability(struct cmd_tbl *cmdtp, int flag, int argc,
        for (i = 0; i < count; i++) {
                printf("Property 0x");
                for (j = 0; j < 4; j++)
-                       printf("%02x", data[(i * 8) + j]);
+                       printf("%02x", data[(i * 8) + j + sizeof(u32)]);
                printf(": 0x");
                for (j = 4; j < 8; j++)
-                       printf("%02x", data[(i * 8) + j]);
+                       printf("%02x", data[(i * 8) + j + sizeof(u32)]);
                printf("\n");
        }
 

diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c
index a4c352e3ef752a1b1521fa87f7a0e28c8f97abcf..91759068cf0336521084d6d8f6fe6ea9236fa221 100644 (file)
--- a/lib/tpm-v2.c
+++ b/lib/tpm-v2.c
@@ -184,10 +184,10 @@ u32 tpm2_get_capability(struct udevice *dev, u32 capability, u32 property,
        /*
         * In the response buffer, the properties are located after the:
         * tag (u16), response size (u32), response code (u32),
-        * YES/NO flag (u8), TPM_CAP (u32) and TPMU_CAPABILITIES (u32).
+        * YES/NO flag (u8), TPM_CAP (u32).
         */
        properties_off = sizeof(u16) + sizeof(u32) + sizeof(u32) +
-                        sizeof(u8) + sizeof(u32) + sizeof(u32);
+                        sizeof(u8) + sizeof(u32);
        memcpy(buf, &response[properties_off], response_len - properties_off);
 
        return 0;