diff options
| author | Simon Glass <sjg@chromium.org> | 2020-03-02 12:02:55 -0700 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-03-03 09:59:55 +1100 |
| commit | e5c92a4780c636fcfa6a84080d365f74393071aa (patch) | |
| tree | 5a79b054559fd784a43f37a9966e8185e1f9053a | |
| parent | e5cc26b68bc094c9260caaf330e03bb71129082e (diff) | |
| download | device-tree-compiler-e5c92a4780c636fcfa6a84080d365f74393071aa.tar.gz | |
libfdt: Use VALID_INPUT for FDT_ERR_BADSTATE checks
This error indicates a logic bug in the code calling libfdt, so VALID_DTB
is not really the right check. Update it to use VALID_INPUT instead.
Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20200302190255.51426-4-sjg@chromium.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | libfdt/fdt.c | 2 | ||||
| -rw-r--r-- | libfdt/fdt_sw.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libfdt/fdt.c b/libfdt/fdt.c index 4419204..c28fcc1 100644 --- a/libfdt/fdt.c +++ b/libfdt/fdt.c @@ -33,7 +33,7 @@ int32_t fdt_ro_probe_(const void *fdt) } } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { /* Unfinished sequential-write blob */ - if (fdt_size_dt_struct(fdt) == 0) + if (!can_assume(VALID_INPUT) && fdt_size_dt_struct(fdt) == 0) return -FDT_ERR_BADSTATE; } else { return -FDT_ERR_BADMAGIC; diff --git a/libfdt/fdt_sw.c b/libfdt/fdt_sw.c index 352193c..26759d5 100644 --- a/libfdt/fdt_sw.c +++ b/libfdt/fdt_sw.c @@ -12,7 +12,7 @@ static int fdt_sw_probe_(void *fdt) { - if (!can_assume(VALID_DTB)) { + if (!can_assume(VALID_INPUT)) { if (fdt_magic(fdt) == FDT_MAGIC) return -FDT_ERR_BADSTATE; else if (fdt_magic(fdt) != FDT_SW_MAGIC) @@ -41,7 +41,7 @@ static int fdt_sw_probe_memrsv_(void *fdt) if (err) return err; - if (!can_assume(VALID_DTB) && fdt_off_dt_strings(fdt) != 0) + if (!can_assume(VALID_INPUT) && fdt_off_dt_strings(fdt) != 0) return -FDT_ERR_BADSTATE; return 0; } @@ -67,7 +67,8 @@ static int fdt_sw_probe_struct_(void *fdt) if (err) return err; - if (fdt_off_dt_strings(fdt) != fdt_totalsize(fdt)) + if (!can_assume(VALID_INPUT) && + fdt_off_dt_strings(fdt) != fdt_totalsize(fdt)) return -FDT_ERR_BADSTATE; return 0; } |