From bf3350225f345546efede1751a70b09f16592dce Mon Sep 17 00:00:00 2001
From: Seiji Munetoh <seiji.munetoh@gmail.com>
Date: Tue, 30 May 2006 21:25:52 -0700
Subject: [PATCH] --- yaml --- r: 27043 b: refs/heads/master c:
 44d7aff035118e8c3993aa3fa05d358d1008e982 h: refs/heads/master i:   27041:
 114b2abd2dfab114bdc89b2a9b36822a25e8f570   27039:
 73aa7e05b9aa9e27fb2640dbf91364a76a2daf18 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/char/tpm/tpm_bios.c | 48 +++----------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/[refs] b/[refs]
index a284acb0b716..9f9b954a7dd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de66a695bef17264b2472c06e981c068bfa0636e
+refs/heads/master: 44d7aff035118e8c3993aa3fa05d358d1008e982
diff --git a/trunk/drivers/char/tpm/tpm_bios.c b/trunk/drivers/char/tpm/tpm_bios.c
index 60380174f245..a611972024e6 100644
--- a/trunk/drivers/char/tpm/tpm_bios.c
+++ b/trunk/drivers/char/tpm/tpm_bios.c
@@ -284,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;
 }