Fix "invalid application of ‘sizeof’ to incomplete type" error in drivers/char/tpm/

[GustavoARSilva]

When replacing the zero-length array event[0] with a flexible-array member in struct tcg_pcr_event:

the following errors show up:

This is due to the flexible-array member having incomplete type.

See flexible-array conversions issue.

[GustavoARSilva]

The current codebase makes use of the zero-length array language
extension to the C90 standard, but the preferred mechanism to declare
variable-length types such as these ones is a flexible array member[1][2],
introduced in C99:

struct foo {
        int stuff;
        struct boo array[];
};

By making use of the mechanism above, we will get a compiler warning
in case the flexible array does not occur last in the structure, which
will help us prevent some kind of undefined behavior bugs from being
inadvertently introduced[3] to the codebase from now on.

Also, notice that, dynamic memory allocations won't be affected by
this change:

"Flexible array members have incomplete type, and so the sizeof operator
may not be applied. As a quirk of the original implementation of
zero-length arrays, sizeof evaluates to zero."[1]

sizeof(flexible-array-member) triggers a warning because flexible array
members have incomplete type[1]. There are some instances of code in
which the sizeof operator is being incorrectly/erroneously applied to
zero-length arrays and the result is zero. Such instances may be hiding
some bugs. So, this work (flexible-array member conversions) will also
help to get completely rid of those sorts of issues.

Also, address the following issue, due to the flexible-array member
having incomplete type[4]:

drivers/char/tpm/eventlog/tpm2.c: In function ‘tpm2_bios_measurements_start’:
drivers/char/tpm/eventlog/tpm2.c:54:46: error: invalid application of ‘sizeof’ to incomplete type ‘u8[]’ {aka ‘unsigned char[]’}
   54 |  size = sizeof(struct tcg_pcr_event) - sizeof(event_header->event)
      |                                              ^
drivers/char/tpm/eventlog/tpm2.c: In function ‘tpm2_bios_measurements_next’:
drivers/char/tpm/eventlog/tpm2.c:102:10: error: invalid application of ‘sizeof’ to incomplete type ‘u8[]’ {aka ‘unsigned char[]’}
  102 |    sizeof(event_header->event) + event_header->event_size;
      |          ^
drivers/char/tpm/eventlog/tpm2.c: In function ‘tpm2_binary_bios_measurements_show’:
drivers/char/tpm/eventlog/tpm2.c:140:10: error: invalid application of ‘sizeof’ to incomplete type ‘u8[]’ {aka ‘unsigned char[]’}
  140 |    sizeof(event_header->event) + event_header->event_size;
      |          ^
scripts/Makefile.build:266: recipe for target 'drivers/char/tpm/eventlog/tpm2.o' failed
make[3]: *** [drivers/char/tpm/eventlog/tpm2.o] Error 1

As mentioned above: "Flexible array members have incomplete type, and
so the sizeof operator may not be applied. As a quirk of the original
implementation of zero-length arrays, sizeof evaluates to zero."[1] So,
the sizeof(flexible-array) can be safely removed to fix the error above.

Lastly, prefer sizeof(*ptr) over sizeof(struct foo).

[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 76497732932f ("cxgb3/l2t: Fix undefined behaviour")
[4] https://github.com/KSPP/linux/issues/43

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
Hi,

I'm resending this because LKML is eating some messages, recently.
Sorry for the noise in case you've already received this patch.

Thanks

 drivers/char/tpm/eventlog/tpm2.c | 9 +++------
 include/linux/tpm_eventlog.h     | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c
index e741b1157525..fdd8056f3e12 100644
--- a/drivers/char/tpm/eventlog/tpm2.c
+++ b/drivers/char/tpm/eventlog/tpm2.c
@@ -51,8 +51,7 @@ static void *tpm2_bios_measurements_start(struct seq_file *m, loff_t *pos)
    int i;
    event_header = addr;
-   size = sizeof(struct tcg_pcr_event) - sizeof(event_header->event)
-       + event_header->event_size;
+   size = sizeof(*event_header) + event_header->event_size;
    if (*pos == 0) {
        if (addr + size < limit) {
@@ -98,8 +97,7 @@ static void *tpm2_bios_measurements_next(struct seq_file *m, void *v,
    event_header = log->bios_event_log;
    if (v == SEQ_START_TOKEN) {
-       event_size = sizeof(struct tcg_pcr_event) -
-           sizeof(event_header->event) + event_header->event_size;
+       event_size = sizeof(*event_header) + event_header->event_size;
        marker = event_header;
    } else {
        event = v;
@@ -136,8 +134,7 @@ static int tpm2_binary_bios_measurements_show(struct seq_file *m, void *v)
    size_t size;
    if (v == SEQ_START_TOKEN) {
-       size = sizeof(struct tcg_pcr_event) -
-           sizeof(event_header->event) + event_header->event_size;
+       size = sizeof(*event_header) + event_header->event_size;
        temp_ptr = event_header;
 diff --git a/include/linux/tpm_eventlog.h b/include/linux/tpm_eventlog.h
index c253461b1c4e..4f8c90c93c29 100644
--- a/include/linux/tpm_eventlog.h
+++ b/include/linux/tpm_eventlog.h
@@ -97,7 +97,7 @@ struct tcg_pcr_event {
    u32 event_type;
    u8 digest[20];
    u32 event_size;
-   u8 event[0];
+   u8 event[];
 } __packed;
  struct tcg_event_field {

[kees]

I think this just should stick with the standard idiom:

size = struct_size(event_header, event, event_header->event_size);

[GustavoARSilva]

Patch sent out: https://lore.kernel.org/lkml/20200507040912.GA31382@embeddedor/

[GustavoARSilva]

v2: https://lore.kernel.org/lkml/20200508163826.GA768@embeddedor/

[GustavoARSilva]

Patch applied and waiting to be added to mainline: https://lore.kernel.org/lkml/2a77f3bc9e7ed88343bbd206eaf25f10a697de90.camel@linux.intel.com/

[GustavoARSilva]

Patch already applied upstream: tpm: eventlog: Replace zero-length array with flexible-array member