mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
ab91c2a89f
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, the following issue shows up 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] As
in "sizeof(event_header->event) always evaluated to 0, so removing it
has no effect".
Lastly, make use of the struct_size() helper to deal with the
flexible array member and its host structure.
This issue was found with the help of Coccinelle.
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 7649773293
("cxgb3/l2t: Fix undefined behaviour")
[4] https://github.com/KSPP/linux/issues/43
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
159 lines
3.9 KiB
C
159 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2016 IBM Corporation
|
|
*
|
|
* Authors:
|
|
* Nayna Jain <nayna@linux.vnet.ibm.com>
|
|
*
|
|
* Access to TPM 2.0 event log as written by Firmware.
|
|
* It assumes that writer of event log has followed TCG Specification
|
|
* for Family "2.0" and written the event data in little endian.
|
|
* With that, it doesn't need any endian conversion for structure
|
|
* content.
|
|
*/
|
|
|
|
#include <linux/seq_file.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/security.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/tpm_eventlog.h>
|
|
|
|
#include "../tpm.h"
|
|
#include "common.h"
|
|
|
|
/*
|
|
* calc_tpm2_event_size() - calculate the event size, where event
|
|
* is an entry in the TPM 2.0 event log. The event is of type Crypto
|
|
* Agile Log Entry Format as defined in TCG EFI Protocol Specification
|
|
* Family "2.0".
|
|
|
|
* @event: event whose size is to be calculated.
|
|
* @event_header: the first event in the event log.
|
|
*
|
|
* Returns size of the event. If it is an invalid event, returns 0.
|
|
*/
|
|
static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
|
|
struct tcg_pcr_event *event_header)
|
|
{
|
|
return __calc_tpm2_event_size(event, event_header, false);
|
|
}
|
|
|
|
static void *tpm2_bios_measurements_start(struct seq_file *m, loff_t *pos)
|
|
{
|
|
struct tpm_chip *chip = m->private;
|
|
struct tpm_bios_log *log = &chip->log;
|
|
void *addr = log->bios_event_log;
|
|
void *limit = log->bios_event_log_end;
|
|
struct tcg_pcr_event *event_header;
|
|
struct tcg_pcr_event2_head *event;
|
|
size_t size;
|
|
int i;
|
|
|
|
event_header = addr;
|
|
size = struct_size(event_header, event, event_header->event_size);
|
|
|
|
if (*pos == 0) {
|
|
if (addr + size < limit) {
|
|
if ((event_header->event_type == 0) &&
|
|
(event_header->event_size == 0))
|
|
return NULL;
|
|
return SEQ_START_TOKEN;
|
|
}
|
|
}
|
|
|
|
if (*pos > 0) {
|
|
addr += size;
|
|
event = addr;
|
|
size = calc_tpm2_event_size(event, event_header);
|
|
if ((addr + size >= limit) || (size == 0))
|
|
return NULL;
|
|
}
|
|
|
|
for (i = 0; i < (*pos - 1); i++) {
|
|
event = addr;
|
|
size = calc_tpm2_event_size(event, event_header);
|
|
|
|
if ((addr + size >= limit) || (size == 0))
|
|
return NULL;
|
|
addr += size;
|
|
}
|
|
|
|
return addr;
|
|
}
|
|
|
|
static void *tpm2_bios_measurements_next(struct seq_file *m, void *v,
|
|
loff_t *pos)
|
|
{
|
|
struct tcg_pcr_event *event_header;
|
|
struct tcg_pcr_event2_head *event;
|
|
struct tpm_chip *chip = m->private;
|
|
struct tpm_bios_log *log = &chip->log;
|
|
void *limit = log->bios_event_log_end;
|
|
size_t event_size;
|
|
void *marker;
|
|
|
|
(*pos)++;
|
|
event_header = log->bios_event_log;
|
|
|
|
if (v == SEQ_START_TOKEN) {
|
|
event_size = struct_size(event_header, event,
|
|
event_header->event_size);
|
|
marker = event_header;
|
|
} else {
|
|
event = v;
|
|
event_size = calc_tpm2_event_size(event, event_header);
|
|
if (event_size == 0)
|
|
return NULL;
|
|
marker = event;
|
|
}
|
|
|
|
marker = marker + event_size;
|
|
if (marker >= limit)
|
|
return NULL;
|
|
v = marker;
|
|
event = v;
|
|
|
|
event_size = calc_tpm2_event_size(event, event_header);
|
|
if (((v + event_size) >= limit) || (event_size == 0))
|
|
return NULL;
|
|
|
|
return v;
|
|
}
|
|
|
|
static void tpm2_bios_measurements_stop(struct seq_file *m, void *v)
|
|
{
|
|
}
|
|
|
|
static int tpm2_binary_bios_measurements_show(struct seq_file *m, void *v)
|
|
{
|
|
struct tpm_chip *chip = m->private;
|
|
struct tpm_bios_log *log = &chip->log;
|
|
struct tcg_pcr_event *event_header = log->bios_event_log;
|
|
struct tcg_pcr_event2_head *event = v;
|
|
void *temp_ptr;
|
|
size_t size;
|
|
|
|
if (v == SEQ_START_TOKEN) {
|
|
size = struct_size(event_header, event,
|
|
event_header->event_size);
|
|
temp_ptr = event_header;
|
|
|
|
if (size > 0)
|
|
seq_write(m, temp_ptr, size);
|
|
} else {
|
|
size = calc_tpm2_event_size(event, event_header);
|
|
temp_ptr = event;
|
|
if (size > 0)
|
|
seq_write(m, temp_ptr, size);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
const struct seq_operations tpm2_binary_b_measurements_seqops = {
|
|
.start = tpm2_bios_measurements_start,
|
|
.next = tpm2_bios_measurements_next,
|
|
.stop = tpm2_bios_measurements_stop,
|
|
.show = tpm2_binary_bios_measurements_show,
|
|
};
|