Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9 am: 9da6d57591 am: f25c58e67f am: 4b55e461f4 am: 1f58b343aa
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352
Change-Id: Icce4d3b2537abf28eb31258cf458786a6138f586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 362cc4a..53db8ce 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -263,7 +263,7 @@
FDT_RO_PROBE(fdt);
- if (namelen < 1)
+ if (!can_assume(VALID_INPUT) && namelen <= 0)
return -FDT_ERR_BADPATH;
/* see if we have an alias */
diff --git a/tests/path_offset.c b/tests/path_offset.c
index 82527d4..07e9d65 100644
--- a/tests/path_offset.c
+++ b/tests/path_offset.c
@@ -48,10 +48,13 @@
verbose_printf("Checking offset of \"%s\" is %d...\n", path, offset);
rc = fdt_path_offset(fdt, path);
+ if (rc == offset)
+ return;
+
if (rc < 0)
FAIL("fdt_path_offset(\"%s\") failed: %s",
path, fdt_strerror(rc));
- if (rc != offset)
+ else
FAIL("fdt_path_offset(\"%s\") returned incorrect offset"
" %d instead of %d", path, rc, offset);
}
@@ -102,6 +105,7 @@
check_path_offset(fdt, "/subnode@2/subsubnode", subsubnode2_offset2);
/* Test paths with extraneous separators */
+ check_path_offset(fdt, "", -FDT_ERR_BADPATH);
check_path_offset(fdt, "//", 0);
check_path_offset(fdt, "///", 0);
check_path_offset(fdt, "//subnode@1", subnode1_offset);
@@ -110,6 +114,8 @@
check_path_offset(fdt, "/subnode@2////subsubnode", subsubnode2_offset2);
/* Test fdt_path_offset_namelen() */
+ check_path_offset_namelen(fdt, "/subnode@1", -1, -FDT_ERR_BADPATH);
+ check_path_offset_namelen(fdt, "/subnode@1", 0, -FDT_ERR_BADPATH);
check_path_offset_namelen(fdt, "/subnode@1", 1, 0);
check_path_offset_namelen(fdt, "/subnode@1/subsubnode", 10, subnode1_offset);
check_path_offset_namelen(fdt, "/subnode@1/subsubnode", 11, subnode1_offset);