morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

boot: allow building sd-boot with -Werror=flex-array-member-not-at-end

Browse Source
This commit is contained in:
Yu Watanabe
2025-04-04 01:14:10 +09:00
parent 5b160db520
commit b547f3eb92
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/boot/measure.c
View File

@@ -18,10 +18,10 @@ static EFI_STATUS tpm2_measure_to_pcr_and_tagged_event_log(
uint32_t event_id,
const char16_t *description) {
_cleanup_free_ struct event {
_cleanup_free_ union event {
EFI_TCG2_EVENT tcg_event;
EFI_TCG2_TAGGED_EVENT tcg_tagged_event;
} _packed_ *event = NULL;
} *event = NULL;
size_t desc_len, event_size;
assert(tcg);
@@ -30,21 +30,17 @@ static EFI_STATUS tpm2_measure_to_pcr_and_tagged_event_log(
/* New style stuff we log as EV_EVENT_TAG with a recognizable event tag. */
desc_len = strsize16(description);
event_size = offsetof(EFI_TCG2_EVENT, Event) + offsetof(EFI_TCG2_TAGGED_EVENT, Event) + desc_len;
event_size = offsetof(EFI_TCG2_TAGGED_EVENT, Event) + desc_len;
event = xmalloc(event_size);
*event = (struct event) {
.tcg_event = (EFI_TCG2_EVENT) {
.Size = event_size,
.Header.HeaderSize = sizeof(EFI_TCG2_EVENT_HEADER),
.Header.HeaderVersion = EFI_TCG2_EVENT_HEADER_VERSION,
.Header.PCRIndex = pcrindex,
.Header.EventType = EV_EVENT_TAG,
},
.tcg_tagged_event = {
.EventId = event_id,
.EventSize = desc_len,
},
event->tcg_tagged_event = (EFI_TCG2_TAGGED_EVENT) {
.Size = event_size,
.Header.HeaderSize = sizeof(EFI_TCG2_EVENT_HEADER),
.Header.HeaderVersion = EFI_TCG2_EVENT_HEADER_VERSION,
.Header.PCRIndex = pcrindex,
.Header.EventType = EV_EVENT_TAG,
.EventId = event_id,
.EventSize = desc_len,
};
memcpy(event->tcg_tagged_event.Event, description, desc_len);

2
src/boot/proto/tcg.h
View File

@@ -59,6 +59,8 @@ typedef struct {
} _packed_ EFI_TCG2_EVENT;
typedef struct {
uint32_t Size;
EFI_TCG2_EVENT_HEADER Header;
uint32_t EventId;
uint32_t EventSize;
uint8_t Event[];