aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-12-09 10:28:56 -0800
committerXin Li <delphij@google.com>2022-12-09 10:28:56 -0800
commit82a38bf5535f0c9702696952f8efd3cedd318d39 (patch)
treeca2d1319e853751b522976eaaaae7a46a41ce3f2
parentbca43fa152a84a8c48971b8424a7122c2054f8d4 (diff)
parent5d258c95567fefca04ff39b611b5e53877ae8cd8 (diff)
downloaddtc-82a38bf5535f0c9702696952f8efd3cedd318d39.tar.gz
Merge Android 13 QPR1
Bug: 261731544 Merged-In: I14ab0a074ab994c1f598243d2d5795d2cd9a853a Change-Id: I26650c5f0a4d98796dd1a9a8709ba704350b5492
-rw-r--r--libfdt/fdt_ro.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 9f6c551..87d736b 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -255,6 +255,12 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
FDT_RO_PROBE(fdt);
+ if (namelen < 1)
+ return -FDT_ERR_BADPATH;
+
+ if (namelen < 1)
+ return -FDT_ERR_BADPATH;
+
/* see if we have an alias */
if (*path != '/') {
const char *q = memchr(path, '/', end - p);