diff options
author | Pierre-Clément Tosi <ptosi@google.com> | 2023-10-12 12:46:05 +0000 |
---|---|---|
committer | Pierre-Clément Tosi <ptosi@google.com> | 2023-10-12 20:54:16 +0000 |
commit | 33f150e6da3e50b10bb99334c617879196ee6c34 (patch) | |
tree | d4998e975314b680a94da68d998dfc39041a3907 | |
parent | 0e7797a53c131f9174d4f3a41cab04b477def75a (diff) | |
parent | e5b8c171c50ad29e12b3689cc0cc8ef1a0fcb313 (diff) | |
download | dtc-33f150e6da3e50b10bb99334c617879196ee6c34.tar.gz |
[resolved conflict] Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: e5b8c171c5
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253
Cause of the conflict: commit 9308e7f9772bd reverted by aosp/2784250 missing from main-trusty
Change-Id: I65b006f282eb9c4267d3e663f7a7ed7c84ae35a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libfdt/fdt_ro.c | 23 | ||||
-rw-r--r-- | tests/aliases.dts | 4 | ||||
-rw-r--r-- | tests/get_alias.c | 14 |
3 files changed, 36 insertions, 5 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 47e0bac..09d92d4 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -525,16 +525,31 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) return fdt32_ld_(php); } +static const void *fdt_path_getprop_namelen(const void *fdt, const char *path, + const char *propname, int propnamelen, + int *lenp) +{ + int offset = fdt_path_offset(fdt, path); + + if (offset < 0) + return NULL; + + return fdt_getprop_namelen(fdt, offset, propname, propnamelen, lenp); +} + const char *fdt_get_alias_namelen(const void *fdt, const char *name, int namelen) { - int aliasoffset; + int len; + const char *alias; + + alias = fdt_path_getprop_namelen(fdt, "/aliases", name, namelen, &len); - aliasoffset = fdt_path_offset(fdt, "/aliases"); - if (aliasoffset < 0) + if (!can_assume(VALID_DTB) && + !(alias && len > 0 && alias[len - 1] == '\0' && *alias == '/')) return NULL; - return fdt_getprop_namelen(fdt, aliasoffset, name, namelen, NULL); + return alias; } const char *fdt_get_alias(const void *fdt, const char *name) diff --git a/tests/aliases.dts b/tests/aliases.dts index 853479a..03ed675 100644 --- a/tests/aliases.dts +++ b/tests/aliases.dts @@ -5,6 +5,10 @@ #size-cells = <0>; aliases { + empty = ""; + loop = "loop"; + nonull = [626164]; + relative = "s1/subsubnode"; s1 = &sub1; ss1 = &subsub1; sss1 = &subsubsub1; diff --git a/tests/get_alias.c b/tests/get_alias.c index fb2c38c..d2888d6 100644 --- a/tests/get_alias.c +++ b/tests/get_alias.c @@ -21,9 +21,16 @@ static void check_alias(void *fdt, const char *path, const char *alias) aliaspath = fdt_get_alias(fdt, alias); - if (path && !aliaspath) + if (!path && !aliaspath) + return; + + if (!aliaspath) FAIL("fdt_get_alias(%s) failed\n", alias); + if (!path) + FAIL("fdt_get_alias(%s) returned %s instead of NULL", + alias, aliaspath); + if (strcmp(aliaspath, path) != 0) FAIL("fdt_get_alias(%s) returned %s instead of %s\n", alias, aliaspath, path); @@ -36,9 +43,14 @@ int main(int argc, char *argv[]) test_init(argc, argv); fdt = load_blob_arg(argc, argv); + check_alias(fdt, NULL, "empty"); + check_alias(fdt, NULL, "nonull"); + check_alias(fdt, NULL, "relative"); check_alias(fdt, "/subnode@1", "s1"); check_alias(fdt, "/subnode@1/subsubnode", "ss1"); check_alias(fdt, "/subnode@1/subsubnode/subsubsubnode", "sss1"); + check_alias(fdt, NULL, "loop"); // Might trigger a stack overflow + PASS(); } |