From 34052ef78cf8724dee73e9279b2c6bff8cfed234 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Apr 2021 14:07:12 -0500 Subject: libfdt: Add FDT alignment check to fdt_check_header() Only checking the FDT alignment in fdt_ro_probe_() means that fdt_check_header() can pass, but then subsequent API calls fail on alignment checks. Let's add an alignment check to fdt_check_header() so alignment errors are found up front. Cc: Tom Rini Cc: Frank Rowand Signed-off-by: Rob Herring Message-Id: <20210406190712.2118098-1-robh@kernel.org> Signed-off-by: David Gibson --- cpukit/dtc/libfdt/fdt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cpukit/dtc') diff --git a/cpukit/dtc/libfdt/fdt.c b/cpukit/dtc/libfdt/fdt.c index 3e893073da..9fe7cf4b74 100644 --- a/cpukit/dtc/libfdt/fdt.c +++ b/cpukit/dtc/libfdt/fdt.c @@ -90,6 +90,10 @@ int fdt_check_header(const void *fdt) { size_t hdrsize; + /* The device tree must be at an 8-byte aligned address */ + if ((uintptr_t)fdt & 7) + return -FDT_ERR_ALIGNMENT; + if (fdt_magic(fdt) != FDT_MAGIC) return -FDT_ERR_BADMAGIC; if (!can_assume(LATEST)) { -- cgit v1.2.3