aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2022-09-23 08:10:15 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2022-09-23 08:10:15 +0000
commit5b78ca841071fee81479036462e7e048fefacb26 (patch)
tree05e348ff5e6d0c5be3ce3af495d501eee0a0ef56
parentdf489c8f432796a2540f9ba8a69973ce7463644c (diff)
parentc69e9730e658eda4f30f910c49cc073e89238e2f (diff)
downloaddtc-5b78ca841071fee81479036462e7e048fefacb26.tar.gz
[automerge] libfdt: fdt_path_offset_namelen: Reject empty paths 2p: a6ac6d916d 2p: c69e9730e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/20024810 Bug: 246465319 Change-Id: I9096ca5ab6c194d2512e3c902a9658c33a40ff0c
-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 e03570a..7a65dfe 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -253,6 +253,9 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
FDT_RO_PROBE(fdt);
+ if (namelen < 1)
+ return -FDT_ERR_BADPATH;
+
/* see if we have an alias */
if (*path != '/') {
const char *q = memchr(path, '/', end - p);