summaryrefslogtreecommitdiff
path: root/libfdt/fdt.c
diff options
context:
space:
mode:
author Sadaf Ebrahimi <sadafebrahimi@google.com> 2024-04-11 16:38:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-11 16:38:22 +0000
commitde525a0c77a0e30ab2e664d590981e7ec82fb770 (patch)
tree39079d8f82b3dca7d53b7260adf862f4906e2553 /libfdt/fdt.c
parentc4db10d48e96701e0bd7391a49f3c67de9f71113 (diff)
parent835431ed392390ee22d557bd35d385ebb892cd0d (diff)
Upgrade dtc to v1.7.0 am: 835431ed39
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/3015236 Change-Id: Ic163828d753c92d5fa9b03d7f78cd52688fd00fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libfdt/fdt.c')
-rw-r--r--libfdt/fdt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index b8ffb33..dda342d 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -106,7 +106,6 @@ int fdt_check_header(const void *fdt)
}
hdrsize = fdt_header_size(fdt);
if (!can_assume(VALID_DTB)) {
-
if ((fdt_totalsize(fdt) < hdrsize)
|| (fdt_totalsize(fdt) > INT_MAX))
return -FDT_ERR_TRUNCATED;
@@ -115,9 +114,7 @@ int fdt_check_header(const void *fdt)
if (!check_off_(hdrsize, fdt_totalsize(fdt),
fdt_off_mem_rsvmap(fdt)))
return -FDT_ERR_TRUNCATED;
- }
- if (!can_assume(VALID_DTB)) {
/* Bounds check structure block */
if (!can_assume(LATEST) && fdt_version(fdt) < 17) {
if (!check_off_(hdrsize, fdt_totalsize(fdt),