diff options
| author | Ivan Jager <aij+git@mrph.org> | 2023-09-23 08:34:32 -0500 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2023-10-06 10:11:31 +0000 |
| commit | 6a249d688ec4922e01e1143863a70a57bd0e51fd (patch) | |
| tree | 7d19d0aac69a8f08c704652f5b78bf773dfbd31d | |
| parent | 20a332a30e01117cdb093119cd308d4538ea3fc2 (diff) | |
| download | coreboot-6a249d688ec4922e01e1143863a70a57bd0e51fd.tar.gz coreboot-6a249d688ec4922e01e1143863a70a57bd0e51fd.tar.bz2 coreboot-6a249d688ec4922e01e1143863a70a57bd0e51fd.zip | |
cbfs: Restore 32-bit padding in cbfs_header
It was changed from a fixed size-1 array to a flexible array
in commit 242bac0e162c ("…: Use C99 flexible arrays") which resulted
in a change to the serialized format as the header size was no longer
the same.
That broke other tools that read CBFS files, like diffoscope
https://github.com/NixOS/nixpkgs/issues/256896
Change-Id: I4199dcc4823469c5986ac967a55b1c85cc62f780
Signed-off-by: Ivan Jager <aij+git@mrph.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78239
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Patrick Georgi <patrick@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h index 07d3d9de4db7..cebaf8395ede 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbfs_serialized.h @@ -60,7 +60,7 @@ struct cbfs_header { uint32_t align; /* fixed to 64 bytes */ uint32_t offset; uint32_t architecture; - uint32_t pad[]; + uint32_t pad[1]; } __packed; /* this used to be flexible, but wasn't ever set to something different. */ |