Browse Source

libfdt: Check for 8-byte address alignment in fdt_ro_probe_()

The device tree must be loaded in to memory at an 8-byte aligned
address.  Add a check for this condition in fdt_ro_probe_() and a new
error code to return if we are not.

Signed-off-by: Tom Rini <trini@konsulko.com>
Message-Id: <20201104130605.28874-1-trini@konsulko.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
Tom Rini 4 years ago committed by David Gibson
parent
commit
5e735860c4
  1. 4
      libfdt/fdt.c
  2. 6
      libfdt/libfdt.h

4
libfdt/fdt.c

@ -22,6 +22,10 @@ int32_t fdt_ro_probe_(const void *fdt)
if (can_assume(VALID_DTB)) if (can_assume(VALID_DTB))
return totalsize; return totalsize;


/* 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) { if (fdt_magic(fdt) == FDT_MAGIC) {
/* Complete tree */ /* Complete tree */
if (!can_assume(LATEST)) { if (!can_assume(LATEST)) {

6
libfdt/libfdt.h

@ -101,7 +101,11 @@ extern "C" {
/* FDT_ERR_BADFLAGS: The function was passed a flags field that /* FDT_ERR_BADFLAGS: The function was passed a flags field that
* contains invalid flags or an invalid combination of flags. */ * contains invalid flags or an invalid combination of flags. */


#define FDT_ERR_MAX 18 #define FDT_ERR_ALIGNMENT 19
/* FDT_ERR_ALIGNMENT: The device tree base address is not 8-byte
* aligned. */

#define FDT_ERR_MAX 19


/* constants */ /* constants */
#define FDT_MAX_PHANDLE 0xfffffffe #define FDT_MAX_PHANDLE 0xfffffffe

Loading…
Cancel
Save