1 files changed, 29 insertions, 60 deletions

diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index e45f0d3d12de..a611972024e6 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -105,6 +105,12 @@ static const char* tcpa_event_type_strings[] = {
         "Non-Host Info"
 };
 
+struct tcpa_pc_event {
+        u32 event_id;
+        u32 event_size;
+        u8 event_data[0];
+};
+
 enum tcpa_pc_event_ids {
         SMBIOS = 1,
         BIS_CERT,
@@ -114,14 +120,15 @@ enum tcpa_pc_event_ids {
         NVRAM,
         OPTION_ROM_EXEC,
         OPTION_ROM_CONFIG,
-        OPTION_ROM_MICROCODE,
+        OPTION_ROM_MICROCODE = 10,
         S_CRTM_VERSION,
         S_CRTM_CONTENTS,
         POST_CONTENTS,
+        HOST_TABLE_OF_DEVICES,
 };
 
 static const char* tcpa_pc_event_id_strings[] = {
-        ""
+        "",
         "SMBIOS",
         "BIS Certificate",
         "POST BIOS ",
@@ -130,11 +137,12 @@ static const char* tcpa_pc_event_id_strings[] = {
         "NVRAM",
         "Option ROM",
         "Option ROM config",
-        "Option ROM microcode",
+        "",
+        "Option ROM microcode ",
         "S-CRTM Version",
-        "S-CRTM Contents",
-        "S-CRTM POST Contents",
-        "POST Contents",
+        "S-CRTM Contents ",
+        "POST Contents ",
+        "Table of Devices",
 };
 
 /* returns pointer to start of pos. entry of tcg log */
@@ -206,7 +214,7 @@ static int get_event_name(char *dest, struct tcpa_event *event,
         const char *name = "";
         char data[40] = "";
         int i, n_len = 0, d_len = 0;
-        u32 event_id;
+        struct tcpa_pc_event *pc_event;
 
         switch(event->event_type) {
         case PREBOOT:
@@ -235,31 +243,32 @@ static int get_event_name(char *dest, struct tcpa_event *event,
                 }
                 break;
         case EVENT_TAG:
-                event_id = be32_to_cpu(*((u32 *)event_entry));
+                pc_event = (struct tcpa_pc_event *)event_entry;
 
                 /* ToDo Row data -> Base64 */
 
-                switch (event_id) {
+                switch (pc_event->event_id) {
                 case SMBIOS:
                 case BIS_CERT:
                 case CMOS:
                 case NVRAM:
                 case OPTION_ROM_EXEC:
                 case OPTION_ROM_CONFIG:
-                case OPTION_ROM_MICROCODE:
                 case S_CRTM_VERSION:
-                case S_CRTM_CONTENTS:
-                case POST_CONTENTS:
-                        name = tcpa_pc_event_id_strings[event_id];
+                        name = tcpa_pc_event_id_strings[pc_event->event_id];
                         n_len = strlen(name);
                         break;
+                /* hash data */
                 case POST_BIOS_ROM:
                 case ESCD:
-                        name = tcpa_pc_event_id_strings[event_id];
+                case OPTION_ROM_MICROCODE:
+                case S_CRTM_CONTENTS:
+                case POST_CONTENTS:
+                        name = tcpa_pc_event_id_strings[pc_event->event_id];
                         n_len = strlen(name);
                         for (i = 0; i < 20; i++)
-                                d_len += sprintf(data, "%02x",
-                                                event_entry[8 + i]);
+                                d_len += sprintf(&data[2*i], "%02x",
+                                                pc_event->event_data[i]);
                         break;
                 default:
                         break;
@@ -275,53 +284,13 @@ static int get_event_name(char *dest, struct tcpa_event *event,
 
 static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
 {
+        struct tcpa_event *event = v;
+        char *data = v;
+        int i;
 
-        char *eventname;
-        char data[4];
-        u32 help;
-        int i, len;
-        struct tcpa_event *event = (struct tcpa_event *) v;
-        unsigned char *event_entry =
-            (unsigned char *) (v + sizeof(struct tcpa_event));
-
-        eventname = kmalloc(MAX_TEXT_EVENT, GFP_KERNEL);
-        if (!eventname) {
-                printk(KERN_ERR "%s: ERROR - No Memory for event name\n ",
-                       __func__);
-                return -ENOMEM;
-        }
-
-        /* 1st: PCR used is in little-endian format (4 bytes) */
-        help = le32_to_cpu(event->pcr_index);
-        memcpy(data, &help, 4);
-        for (i = 0; i < 4; i++)
-                seq_putc(m, data[i]);
-
-        /* 2nd: SHA1 (20 bytes) */
-        for (i = 0; i < 20; i++)
-                seq_putc(m, event->pcr_value[i]);
-
-        /* 3rd: event type identifier (4 bytes) */
-        help = le32_to_cpu(event->event_type);
-        memcpy(data, &help, 4);
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
                 seq_putc(m, data[i]);
 
-        len = 0;
-
-        len += get_event_name(eventname, event, event_entry);
-
-        /* 4th:  filename <= 255 + \'0' delimiter */
-        if (len > TCG_EVENT_NAME_LEN_MAX)
-                len = TCG_EVENT_NAME_LEN_MAX;
-
-        for (i = 0; i < len; i++)
-                seq_putc(m, eventname[i]);
-
-        /* 5th: delimiter */
-        seq_putc(m, '\0');
-
-        kfree(eventname);
         return 0;
 }