From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 10 Dec 2020 20:18:28 +0000 (-0500)
Subject: tpm: Use smbios_get_tables()
X-Git-Tag: rel-1.16.0~32
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4912bae2d14e9258f0c873aa09139bf73fc3ebb9;p=seabios.git

tpm: Use smbios_get_tables()

Instead of using the SMBios21Addr global variable, use the
smbios_get_tables() helper.  This doesn't change any behavior
yet, but it will be useful when we start supporting SMBIOS 3.0
entry points.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/src/tcgbios.c b/src/tcgbios.c
index 58eb2fe..fe844b2 100644
--- a/src/tcgbios.c
+++ b/src/tcgbios.c
@@ -1058,15 +1058,15 @@ tpm_smbios_measure(void)
         .eventid = 1,
         .eventdatasize = SHA1_BUFSIZE,
     };
-    struct smbios_21_entry_point *sep = SMBios21Addr;
+    u32 smbios_len;
+    void *smbios_tables = smbios_get_tables(&smbios_len);
 
-    dprintf(DEBUG_tcg, "TCGBIOS: SMBIOS at %p\n", sep);
+    dprintf(DEBUG_tcg, "TCGBIOS: SMBIOS tables at %p\n", smbios_tables);
 
-    if (!sep)
+    if (!smbios_tables)
         return;
 
-    sha1((const u8 *)sep->structure_table_address,
-         sep->structure_table_length, pcctes.digest);
+    sha1((const u8 *)smbios_tables, smbios_len, pcctes.digest);
     tpm_add_measurement_to_log(1,
                                EV_EVENT_TAG,
                                (const char *)&pcctes, sizeof(pcctes),