commit 2b3ff5c1b69580d1aabdd98455df4362f19ef653
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 09 17:46:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 09 17:46:53 2022 +0000
tree 2571db2055c44a214cfd22f40946ae80bd59af8c
parent cdb45e721d1a95795099311fb7d7350e6e50e207
parent ec4f0887ebf13068c96b0938c18077fddbbe2e1f

Merge "ANDROID: fuzz: Only check valid phandles" am: 91b7c8d942 am: ec4f0887eb

Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2171323

Change-Id: Ia9b8d699766689c5401edbde8839dd29efdcde42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fuzzing/libfdt_fuzzer.c

diff --git a/fuzzing/libfdt_fuzzer.c b/fuzzing/libfdt_fuzzer.c
index 98e03c8..89fe3c2 100644
--- a/fuzzing/libfdt_fuzzer.c
+++ b/fuzzing/libfdt_fuzzer.c
@@ -55,6 +55,9 @@
 #endif
 }
 
+static bool phandle_is_valid(uint32_t phandle) {
+  return phandle != 0 && phandle != UINT32_MAX;
+}
 
 static void walk_device_tree(const void *device_tree, int parent_node) {
   int len = 0;
@@ -64,8 +67,9 @@
   }
 
   uint32_t phandle = fdt_get_phandle(device_tree, parent_node);
-  if (phandle != 0) {
-    assert(parent_node == fdt_node_offset_by_phandle(device_tree, phandle));
+  if (phandle_is_valid(phandle)) {
+    int node = fdt_node_offset_by_phandle(device_tree, phandle);
+    assert(node >= 0); // it should at least find parent_node
   }
 
   // recursively walk the node's children