diff options
| author | Rob Herring (Arm) <robh@kernel.org> | 2026-04-07 15:04:13 -0500 |
|---|---|---|
| committer | Rob Herring (Arm) <robh@kernel.org> | 2026-04-07 15:04:13 -0500 |
| commit | 5a09df20872c1897506351636fdafbcda97ff2c0 (patch) | |
| tree | a6d1f156ac63aad86bbbdd0143733dec26b786e5 /scripts/dtc/libfdt/fdt.c | |
| parent | c349e45fbe1f752432f291d24f43d67ab9007758 (diff) | |
| download | linux-next-5a09df20872c1897506351636fdafbcda97ff2c0.tar.gz linux-next-5a09df20872c1897506351636fdafbcda97ff2c0.zip | |
scripts/dtc: Update to upstream version v1.7.2-69-g53373d135579
This adds the following commits from upstream:
53373d135579 dtc: Remove unused dts_version in dtc-lexer.l
caf7465c5d60 libfdt: fdt_check_full: Handle FDT_NOP when FDT_END is expected
5976c4a66098 libfdt: fdt_rw: Introduce fdt_downgrade_version()
5bb5bedd347d fdtdump: Return an error code on wrong tag value
68b960e299f7 fdtdump: Remove dtb version check
adba02caf554 dtc: Use a consistent type for basenamelen
8d15a63e84ff libfdt: Verify alignment of sub-blocks in dtb
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Diffstat (limited to 'scripts/dtc/libfdt/fdt.c')
| -rw-r--r-- | scripts/dtc/libfdt/fdt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/dtc/libfdt/fdt.c b/scripts/dtc/libfdt/fdt.c index 95f644c31f94..56d4dcb2dc92 100644 --- a/scripts/dtc/libfdt/fdt.c +++ b/scripts/dtc/libfdt/fdt.c @@ -110,6 +110,14 @@ int fdt_check_header(const void *fdt) || (fdt_totalsize(fdt) > INT_MAX)) return -FDT_ERR_TRUNCATED; + /* memrsv block must be 8 byte aligned */ + if (fdt_off_mem_rsvmap(fdt) % sizeof(uint64_t)) + return -FDT_ERR_ALIGNMENT; + + /* Structure block must be 4 byte aligned */ + if (fdt_off_dt_struct(fdt) % FDT_TAGSIZE) + return -FDT_ERR_ALIGNMENT; + /* Bounds check memrsv block */ if (!check_off_(hdrsize, fdt_totalsize(fdt), fdt_off_mem_rsvmap(fdt))) |