additional little endian support
cover additional little endian support
Hi,
The patch set converts big endian event log entries to guest format in PowerPC, which supports both little endian and big endian guests. It also contains a fix to make sure the last event entry wasn't skipped.
Hon Ching(Vicky) Lo (3):
vTPM: fixed the limit checking
TPM: remove unnecessary little endian conversion
vTPM: support little endian guests
drivers/char/tpm/tpm_eventlog.c | 95 ++++++++++++++++++++++++++++++--------- drivers/char/tpm/tpm_of.c | 4 +- 2 files changed, 75 insertions(+), 24 deletions(-)
PATCH 1/3 vTPM: fixed the limit checking
Do not skip the last entry of the event log.
Changelog:
- remove redundant code
--- drivers/char/tpm/tpm_eventlog.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/char/tpm/tpm_eventlog.c +1 -4
@@ -116,11 +116,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v, event = v; -if (event->event_type ==0 && event->event_size ==0 ) -return NULL ; -if ((event->event_type ==0 && event->event_size ==0 ) || - ((v +sizeof (struct tcpa_event ) + event->event_size) >= limit)) + ((v +sizeof (struct tcpa_event ) + event->event_size) > limit))return NULL ; (*pos)++;
Signature · 1 line
1.7.1
Re: [tpmdd-devel] [PATCH 1/3] vTPM: fixed the limit checking
Quoted 18 lines · Hon Ching(Vicky) Lo
Do not skip the last entry of the event log.
Signed-off-by Hon Ching(Vicky) Lo <[email protected]>Signed-off-by Joy Latten <[email protected]>Changelog:
- remove redundant code--- drivers/char/tpm/tpm_eventlog.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)drivers/char/tpm/tpm_eventlog.c +0
-0@@ -116,11 +116,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v, event = v;
drivers/char/tpm/tpm_eventlog.c static void *tpm_bios_measurements_next(struct seq_file *m, void *v, · line 123
Quoted 10 lines
drivers/char/tpm/tpm_eventlog.c +1
-4-if (event->event_type ==0 && event->event_size ==0 ) -return NULL ; -if ((event->event_type ==0 && event->event_size ==0 ) || - ((v +sizeof (struct tcpa_event ) + event->event_size) >= limit)) + ((v +sizeof (struct tcpa_event ) + event->event_size) > limit))return NULL ; (*pos)++;
The limit stems from log->bios_event_log_end and is calculated as follows:
log->bios_event_log_end = log->bios_event_log + len;
The '>=' above is correct since the limit address itself is not part of the log anymore.
The log is the following sequence of addresses:
[log->bios_event_log ... log->bios_event_log + len - 1 ]
or
[log->bios_event_log ... log->bios_event_log + len [
with ']' meaning inclusive and '[' meaning exclusive.
Stefan
Re: [tpmdd-devel] [PATCH 1/3] vTPM: fixed the limit checking
Hi Stefan,
Quoted 39 lines · Stefan Berger
Quoted 18 lines · Hon Ching(Vicky) Lo
Do not skip the last entry of the event log.
Signed-off-by Hon Ching(Vicky) Lo <[email protected]>Signed-off-by Joy Latten <[email protected]>Changelog:
- remove redundant code--- drivers/char/tpm/tpm_eventlog.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)drivers/char/tpm/tpm_eventlog.c +0
-0@@ -116,11 +116,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v, event = v;drivers/char/tpm/tpm_eventlog.c static void *tpm_bios_measurements_next(struct seq_file *m, void *v, · line 123
Quoted 10 lines
drivers/char/tpm/tpm_eventlog.c +1
-4-if (event->event_type ==0 && event->event_size ==0 ) -return NULL ; -if ((event->event_type ==0 && event->event_size ==0 ) || - ((v +sizeof (struct tcpa_event ) + event->event_size) >= limit)) + ((v +sizeof (struct tcpa_event ) + event->event_size) > limit))return NULL ; (*pos)++;The limit stems from
log->bios_event_log_endand is calculated as follows:log->bios_event_log_end = log->bios_event_log + len;The '>=' above is correct since the limit address itself is not part of the log anymore.
The log is the following sequence of addresses:
Quoted 8 lines
[
log->bios_event_log...log->bios_event_log+ len - 1 ]or
[
log->bios_event_log...log->bios_event_log+ len [with ']' meaning inclusive and '[' meaning exclusive.
Thanks for pointing this out... you are correct. We are just seeing where the spec describes this.
On powerpc(p8/powervm)) using vtpm, the last entry doesn't get shown when ">=", so I suspect phype may be giving us an "inclusive" len. Vicky and I will investigate this.
regards,
Joy
PATCH 2/3 TPM: remove unnecessary little endian conversion
In reply to Hon Ching(Vicky) Loprom_instantiate_sml() already converted the base pointer to little endian. This patch removes this unnecessary additional conversion.
--- drivers/char/tpm/tpm_of.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/char/tpm/tpm_of.c +2 -2
@@ -24,7 +24,7 @@ int read_log(struct tpm_bios_log *log) {struct device_node *np;const u32 *sizep; -const __be64 *basep; +const u64 *basep;if (log->bios_event_log !=NULL ) {pr_err ("%s: ERROR - Eventlog already initialized\n" , __func__);
@@ -63,7 +63,7 @@ int read_log(struct tpm_bios_log *log) log->bios_event_log_end = log->bios_event_log + *sizep; -memcpy (log->bios_event_log,__va (be64_to_cpup (basep)), *sizep); +memcpy (log->bios_event_log,__va (*basep), *sizep);return 0 ;
Signature · 1 line
1.7.1
PATCH 3/3 vTPM: support little endian guests
In reply to Hon Ching(Vicky) LoThe event log in ppc64 arch is always in big endian format. PowerPC supports both little endian and big endian guests. This patch converts the event log entries to guest format.
We defined a macro to convert to guest format. In addition, tpm_binary_bios_measurements_show() is modified to parse the event and print each field individually.
--- drivers/char/tpm/tpm_eventlog.c | 92 +++++++++++++++++++++++++++++++-------- 1 files changed, 73 insertions(+), 19 deletions(-)
drivers/char/tpm/tpm_eventlog.c +73 -19
@@ -28,6 +28,11 @@#include "tpm.h" #include "tpm_eventlog.h" +#ifdef CONFIG_PPC64 +#define convert_to_host_format (x) be32_to_cpu(x) +#else +#define convert_to_host_format (x) x +#endif static const char * tcpa_event_type_strings[] = {"PREBOOT" ,
@@ -82,9 +87,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr;if ((addr +sizeof (struct tcpa_event )) < limit) { -if (event->event_type ==0 && event->event_size ==0 ) +if ((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 ))return NULL ; - addr +=sizeof (struct tcpa_event ) + event->event_size; + addr += (sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)); } }
@@ -94,8 +101,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr; -if ((event->event_type ==0 && event->event_size ==0 ) || - ((addr +sizeof (struct tcpa_event ) + event->event_size) >= limit)) +if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((addr +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) >= limit))return NULL ;return addr;
@@ -108,7 +118,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,struct tpm_bios_log *log = m->private;void *limit = log->bios_event_log_end; - v +=sizeof (struct tcpa_event ) + event->event_size; + v += (sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size));/* now check if current entry is valid */ if ((v +sizeof (struct tcpa_event )) >= limit)
@@ -116,8 +127,11 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v, event = v; -if ((event->event_type ==0 && event->event_size ==0 ) || - ((v +sizeof (struct tcpa_event ) + event->event_size) > limit)) +if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((v +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) > limit))return NULL ; (*pos)++;
@@ -137,7 +151,7 @@ static int get_event_name(char *dest, struct tcpa_event *event,int i, n_len =0 , d_len =0 ;struct tcpa_pc_event *pc_event; -switch (event->event_type) { +switch (convert_to_host_format (event->event_type)) {case PREBOOT :case POST_CODE :case UNUSED :
@@ -153,14 +167,17 @@ static int get_event_name(char *dest, struct tcpa_event *event,case NONHOST_CODE :case NONHOST_CONFIG :case NONHOST_INFO : - name = tcpa_event_type_strings[event->event_type]; + name = + tcpa_event_type_strings[convert_to_host_format + (event->event_type)]; n_len =strlen (name);break ;case SEPARATOR :case ACTION : -if (MAX_TEXT_EVENT > event->event_size) { +if (MAX_TEXT_EVENT > +convert_to_host_format (event->event_size)) { name = event_entry; - n_len = event->event_size; + n_len =convert_to_host_format (event->event_size); }break ;case EVENT_TAG :
@@ -168,7 +185,7 @@ static int get_event_name(char *dest, struct tcpa_event *event,/* ToDo Row data -> Base64 */ -switch (pc_event->event_id) { +switch (convert_to_host_format (pc_event->event_id)) {case SMBIOS :case BIS_CERT :case CMOS :
@@ -176,7 +193,9 @@ static int get_event_name(char *dest, struct tcpa_event *event,case OPTION_ROM_EXEC :case OPTION_ROM_CONFIG :case S_CRTM_VERSION : - name = tcpa_pc_event_id_strings[pc_event->event_id]; + name = + tcpa_pc_event_id_strings[convert_to_host_format + (pc_event->event_id)]; n_len =strlen (name);break ;/* hash data */
@@ -185,7 +204,9 @@ static int get_event_name(char *dest, struct tcpa_event *event,case OPTION_ROM_MICROCODE :case S_CRTM_CONTENTS :case POST_CONTENTS : - name = tcpa_pc_event_id_strings[pc_event->event_id]; + name = + tcpa_pc_event_id_strings[convert_to_host_format + (pc_event->event_id)]; n_len =strlen (name);for (i =0 ; i <20 ; i++) d_len += sprintf(&data[2*i], "%02x",
@@ -208,11 +229,43 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)struct tcpa_event *event = v;char *data = v;int i; - -for (i =0 ; i <sizeof (struct tcpa_event ) + event->event_size; i++) +u32 x; +char tmp[4 ]; + +/* PCR */ + x =convert_to_host_format (event->pcr_index); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Event Type */ + x =convert_to_host_format (event->event_type); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* HASH */ +for (i =0 ; i <20 ; i++)seq_putc (m, data[i]); + data +=20 ; + +/* Size */ + x =convert_to_host_format (event->event_size); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Data */ +if (convert_to_host_format (event->event_size)) { +for (i =0 ; i <convert_to_host_format (event->event_size); i++) +seq_putc (m, data[i]); + }return 0 ; + } static int tpm_bios_measurements_release(struct inode *inode,
@@ -235,7 +288,7 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)char *eventname;struct tcpa_event *event = v;unsigned char *event_entry = - (unsigned char *) (v +sizeof (struct tcpa_event )); + (unsigned char *)(v +sizeof (struct tcpa_event )); eventname =kmalloc (MAX_TEXT_EVENT ,GFP_KERNEL );if (!eventname) {
@@ -244,13 +297,14 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v)return -EFAULT ; } -seq_printf (m,"%2d " , event->pcr_index); +/* 1st: PCR */ +seq_printf (m,"%2d " ,convert_to_host_format (event->pcr_index));/* 2nd: SHA1 */ seq_printf (m,"%20phN" , event->pcr_value);/* 3rd: event type identifier */ -seq_printf (m," %02x" , event->event_type); +seq_printf (m," %02x" ,convert_to_host_format (event->event_type)); len +=get_event_name (eventname, event, event_entry);
Signature · 1 line
1.7.1
Re: [PATCH 3/3] vTPM: support little endian guests
Quoted 4 lines
The event log in ppc64 arch is always in big endian format. PowerPC supports both little endian and big endian guests. This patch converts the event log entries to guest format.
I'm a little confused here. If this patch is to convert the event log entries why are we convert in the conditional statements? One example below:
+ if (((convert_to_host_format(event->event_type) == 0) &&
+ (convert_to_host_format(event->event_size) == 0))
+ ||
+ ((v + sizeof(struct tcpa_event) +
+ convert_to_host_format(event->event_size)) > limit))
Quoted 4 lines
We defined a macro to convert to guest format. In addition,
tpm_binary_bios_measurements_show()is modified to parse the event and print each field individually.
It's nice to have human readable format but it may break existing tools that parse or understand the machine readable format. Any comments on this anyone?
Quoted 6 lines
Quoted 1 line
drivers/char/tpm/tpm_eventlog.c +0
-0
drivers/char/tpm/tpm_eventlog.c line 35
Quoted 8 lines
drivers/char/tpm/tpm_eventlog.c +5
-0@@ -28,6 +28,11 @@#include "tpm.h" #include "tpm_eventlog.h" +#ifdef CONFIG_PPC64 +#define convert_to_host_format (x) be32_to_cpu(x) +#else +#define convert_to_host_format (x) x +#endif
This can go in the header file tpm_eventlog.h
Re: [PATCH 3/3] vTPM: support little endian guests
Thanks Ashley!
Quoted 15 lines
Quoted 3 lines
The event log in ppc64 arch is always in big endian format. PowerPC supports both little endian and big endian guests. This patch converts the event log entries to guest format.
I'm a little confused here. If this patch is to convert the event log entries why are we convert in the conditional statements? One example below:
drivers/char/tpm/tpm_eventlog.c +5
-0+if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((v +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) > limit))Quoted 2 lines
Quoted 4 lines
Quoted 3 lines
We defined a macro to convert to guest format. In addition,
tpm_binary_bios_measurements_show()is modified to parse the event and print each field individually.
We do not convert the whole event entry. Instead, we're converting only what's necessary such as pcr_index, event_type and event_size. pcr_value and event_data are of type u8. They do not need LE conversion.
Quoted 3 lines
It's nice to have human readable format but it may break existing tools that parse or understand the machine readable format. Any comments on this anyone?
I got comments on the format, so I tried to make that conditional statement all in one line, but the 'Lindent' tool puts the lines back to the above format..
Regards,
Vicky
Re: [PATCH 3/3] vTPM: support little endian guests
In reply to Ashley LaiHi Ashley,
Quoted 9 lines · Ashley Lai
Quoted 3 lines
The event log in ppc64 arch is always in big endian format. PowerPC supports both little endian and big endian guests. This patch converts the event log entries to guest format.
I'm a little confused here. If this patch is to convert the event log entries why are we convert in the conditional statements? One example below:
drivers/char/tpm/tpm_eventlog.c static void *tpm_bios_measurements_next(struct seq_file *m, void *v, · line 134
Quoted 5 lines
drivers/char/tpm/tpm_eventlog.c +5
-0+if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((v +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) > limit))
Ah, ok... I see what you are saying.. description may be a bit confusing... we are not converting the event log entries. We are just making sure that raw integers are correctly interpreted on both big and little endian platforms.
Phype sends info (including logs) in big endian.
Thus any raw integers in that data, like event_size and event_type may become "garbaged" when OS is ppc64-LE.
This will ensure raw integers are correctly interpreted for both LE and BE platforms.
Quoted 9 lines
Quoted 4 lines
We defined a macro to convert to guest format. In addition,
tpm_binary_bios_measurements_show()is modified to parse the event and print each field individually.It's nice to have human readable format but it may break existing tools that parse or understand the machine readable format. Any comments on this anyone?
Again, description...
We have not changed the format. We are just making sure that raw integers are correctly interpreted on both big and little endian platforms for vtpm.
Quoted 19 lines
Quoted 6 lines
Quoted 1 line
drivers/char/tpm/tpm_eventlog.c +0
-0drivers/char/tpm/tpm_eventlog.c line 35
Quoted 8 lines
drivers/char/tpm/tpm_eventlog.c +5
-0@@ -28,6 +28,11 @@#include "tpm.h" #include "tpm_eventlog.h" +#ifdef CONFIG_PPC64 +#define convert_to_host_format (x) be32_to_cpu(x) +#else +#define convert_to_host_format (x) x +#endif This can go in the header file
tpm_eventlog.h
Re: [PATCH 3/3] vTPM: support little endian guests
In reply to Hon Ching(Vicky) LoThank you Vicky and Joy for the clarification. This patch mainly converts the fields in the tcpa_event structure. I see the code converts everytime it accesses the event fields. Would it be more efficient if you do the conversion once and reuse them when needed? Could convert_to_host_format(x) takes x as a tcpa_event structure?
If not you still can convert individual fields and reuse them. I'm aware that the pcr_value field is type u8 and it does not need the conversion but if convert_to_host_format() can convert the structure it shouldn't convert u8 type I think.
Quoted 20 lines
static const char* tcpa_event_type_strings[] = { "PREBOOT",drivers/char/tpm/tpm_eventlog.c +4
-2@@ -82,9 +87,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr;if ((addr +sizeof (struct tcpa_event )) < limit) { -if (event->event_type ==0 && event->event_size ==0 ) +if ((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 ))return NULL ; - addr +=sizeof (struct tcpa_event ) + event->event_size; + addr += (sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)); } }@@ -94,8 +101,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr;
drivers/char/tpm/tpm_eventlog.c static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) · line 111
Quoted 10 lines
drivers/char/tpm/tpm_eventlog.c +5
-2-if ((event->event_type ==0 && event->event_size ==0 ) || - ((addr +sizeof (struct tcpa_event ) + event->event_size) >= limit)) +if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((addr +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) >= limit))return NULL ;return addr;
In this function, event_type and event_size can be converted once and reuse.
Quoted 11 lines
case SEPARATOR:
case ACTION:drivers/char/tpm/tpm_eventlog.c +2
-1-if (MAX_TEXT_EVENT > event->event_size) { +if (MAX_TEXT_EVENT > +convert_to_host_format (event->event_size)) {name = event_entry;drivers/char/tpm/tpm_eventlog.c +1
-1- n_len = event->event_size; + n_len =convert_to_host_format (event->event_size);} break; case EVENT_TAG:
Same here.
Quoted 34 lines
drivers/char/tpm/tpm_eventlog.c +27
-2@@ -208,11 +229,43 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)struct tcpa_event *event = v;char *data = v;int i; - -for (i =0 ; i <sizeof (struct tcpa_event ) + event->event_size; i++) +u32 x; +char tmp[4 ]; + +/* PCR */ + x =convert_to_host_format (event->pcr_index); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Event Type */ + x =convert_to_host_format (event->event_type); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* HASH */ +for (i =0 ; i <20 ; i++)seq_putc (m, data[i]); + data +=20 ; + +/* Size */ + x =convert_to_host_format (event->event_size); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ;
drivers/char/tpm/tpm_eventlog.c static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) · line 269
Quoted 10 lines
drivers/char/tpm/tpm_eventlog.c +7
-0+ +/* Data */ +if (convert_to_host_format (event->event_size)) { +for (i =0 ; i <convert_to_host_format (event->event_size); i++) +seq_putc (m, data[i]); + }return 0 ; + }
If the tcpa_event structure is converted, you may be able to get away with memcpy and the for loop.
Thanks,
--Ashley Lai
Re: [PATCH 3/3] vTPM: support little endian guests
Quoted 44 lines
Quoted 44 lines
drivers/char/tpm/tpm_eventlog.c +33
-2@@ -208,11 +229,43 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)struct tcpa_event *event = v;char *data = v;int i; - -for (i =0 ; i <sizeof (struct tcpa_event ) + event->event_size; i++) +u32 x; +char tmp[4 ]; + +/* PCR */ + x =convert_to_host_format (event->pcr_index); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Event Type */ + x =convert_to_host_format (event->event_type); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* HASH */ +for (i =0 ; i <20 ; i++)seq_putc (m, data[i]); + data +=20 ; + +/* Size */ + x =convert_to_host_format (event->event_size); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Data */ +if (convert_to_host_format (event->event_size)) { +for (i =0 ; i <convert_to_host_format (event->event_size); i++) +seq_putc (m, data[i]); + }
Quoted 4 lines
drivers/char/tpm/tpm_eventlog.c static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) · line 269
Quoted 3 lines
drivers/char/tpm/tpm_eventlog.c +1
-0return 0 ; + }If the
tcpa_eventstructure is converted, you may be able to get away with memcpy and the for loop.
You can get away with memcpy and use the original for loop.
for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
seq_putc(m, data[i]);
Thanks,
--Ashley
Re: [PATCH 3/3] vTPM: support little endian guests
In reply to Ashley LaiQuoted 44 lines · Ashley Lai
Thank you Vicky and Joy for the clarification. This patch mainly converts the fields in the
tcpa_eventstructure. I see the code converts everytime it accesses the event fields. Would it be more efficient if you do the conversion once and reuse them when needed? Couldconvert_to_host_format(x)takes x as atcpa_eventstructure?
If not you still can convert individual fields and reuse them. I'm aware that thepcr_valuefield is type u8 and it does not need the conversion but ifconvert_to_host_format()can convert the structure it shouldn't convert u8 type I think.Quoted 20 lines
static const char* tcpa_event_type_strings[] = { "PREBOOT",drivers/char/tpm/tpm_eventlog.c +4
-2@@ -82,9 +87,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr;if ((addr +sizeof (struct tcpa_event )) < limit) { -if (event->event_type ==0 && event->event_size ==0 ) +if ((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 ))return NULL ; - addr +=sizeof (struct tcpa_event ) + event->event_size; + addr += (sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)); } }@@ -94,8 +101,11 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) event = addr;drivers/char/tpm/tpm_eventlog.c static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos) · line 111
Quoted 10 lines
drivers/char/tpm/tpm_eventlog.c +5
-2-if ((event->event_type ==0 && event->event_size ==0 ) || - ((addr +sizeof (struct tcpa_event ) + event->event_size) >= limit)) +if (((convert_to_host_format (event->event_type) ==0 ) && + (convert_to_host_format (event->event_size) ==0 )) + || + ((addr +sizeof (struct tcpa_event ) + +convert_to_host_format (event->event_size)) >= limit))return NULL ;return addr;In this function,
event_typeandevent_sizecan be converted once and reuse.
Quoted 14 lines
Quoted 11 lines
case SEPARATOR:
case ACTION:drivers/char/tpm/tpm_eventlog.c +2
-1-if (MAX_TEXT_EVENT > event->event_size) { +if (MAX_TEXT_EVENT > +convert_to_host_format (event->event_size)) {name = event_entry;drivers/char/tpm/tpm_eventlog.c +1
-1- n_len = event->event_size; + n_len =convert_to_host_format (event->event_size);} break; case EVENT_TAG:Same here.
Agree. It's more efficient to do the conversion once and reuse. convert_to_host_format(x) cannot take tcpa_event structure, as be64_to_cpu() only converts raw integers.
Quoted 41 lines
Quoted 41 lines
drivers/char/tpm/tpm_eventlog.c +33
-2@@ -208,11 +229,43 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)struct tcpa_event *event = v;char *data = v;int i; - -for (i =0 ; i <sizeof (struct tcpa_event ) + event->event_size; i++) +u32 x; +char tmp[4 ]; + +/* PCR */ + x =convert_to_host_format (event->pcr_index); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Event Type */ + x =convert_to_host_format (event->event_type); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* HASH */ +for (i =0 ; i <20 ; i++)seq_putc (m, data[i]); + data +=20 ; + +/* Size */ + x =convert_to_host_format (event->event_size); +memcpy (tmp, &x,4 ); +for (i =0 ; i <4 ; i++) +seq_putc (m, tmp[i]); + data +=4 ; + +/* Data */ +if (convert_to_host_format (event->event_size)) { +for (i =0 ; i <convert_to_host_format (event->event_size); i++) +seq_putc (m, data[i]); + }
Quoted 9 lines
drivers/char/tpm/tpm_eventlog.c static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) · line 269
Quoted 3 lines
drivers/char/tpm/tpm_eventlog.c +1
-0return 0 ; + }If the
tcpa_eventstructure is converted, you may be able to get away with memcpy and the for loop.Thanks,
--Ashley Lai
To simplify the code, we can try creating a struct that contains the first 4 fields in the tcpa_event so to only copy over the header part. Then we do conversion on it. That way, we can use a loop to print byte-by-byte on the new struct. Then, we can use a small loop to print byte-by-byte of the data part of the original event structure. I'll try this and re-submit patch.
Thanks!
Vicky