tpm: fix event_size output in tpm1_binary_bios_measurements_show

Commit 186d124f07da ("tpm_eventlog.c: fix binary_bios_measurements")
split the output to write the endian-converted event header first and
then the variable-length event data.

However, the split was at sizeof(struct tcpa_event) - 1, even though
event_data was a zero-length array, and later a flexible array member,
both of which already excluded the event data.

Therefore, the current code writes the first three bytes of event_size
from the endian-converted header and then the last byte from the raw
header, which can emit a corrupted event_size on PPC64, where
do_endian_conversion() maps to be32_to_cpu().

Split one byte later to write the full endian-converted header first,
followed by the variable-length event->event_data.

Fixes: 186d124f07da ("tpm_eventlog.c: fix binary_bios_measurements")
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>

diff --git a/drivers/char/tpm/eventlog/tpm1.c b/drivers/char/tpm/eventlog/tpm1.c
index e7913b2853d53d57f1b55bbfb543a45b717bbd08..0397e3361020a728f12b79d3a01ee1b97c53a314 100644 (file)
--- a/drivers/char/tpm/eventlog/tpm1.c
+++ b/drivers/char/tpm/eventlog/tpm1.c
@@ -236,12 +236,12 @@ static int tpm1_binary_bios_measurements_show(struct seq_file *m, void *v)
 
        temp_ptr = (char *) &temp_event;
 
-       for (i = 0; i < (sizeof(struct tcpa_event) - 1) ; i++)
+       for (i = 0; i < sizeof(struct tcpa_event); i++)
                seq_putc(m, temp_ptr[i]);
 
        temp_ptr = (char *) v;
 
-       for (i = (sizeof(struct tcpa_event) - 1);
+       for (i = sizeof(struct tcpa_event);
             i < (sizeof(struct tcpa_event) + temp_event.event_size); i++)
                seq_putc(m, temp_ptr[i]);