aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2022-09-26 09:33:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-26 09:33:49 +0000
commit13d00fad64773163e937995ad6f5ec0db7d5e105 (patch)
treedcd15991ced4f7d4f29fae62d9a9281bd1af4d24
parentaa22bcd1bcb8c1b361298f0deeb9ebd5907930ad (diff)
parente0440b09079afacb3101f5140560f719d438dadc (diff)
downloaddtc-13d00fad64773163e937995ad6f5ec0db7d5e105.tar.gz
libfdt: fdt_path_offset_namelen: Reject empty paths am: d10c84c4bc am: 9f4834b735 am: e0440b0907
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/20024811 Change-Id: I93019a1667a5f399d1619cf05997960ebafcd0e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libfdt/fdt_ro.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 08de2cc..3b65f16 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -188,6 +188,9 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
FDT_CHECK_HEADER(fdt);
+ if (namelen < 1)
+ return -FDT_ERR_BADPATH;
+
/* see if we have an alias */
if (*path != '/') {
const char *q = memchr(path, '/', end - p);