tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I414bf0b185b702bfdfbffb0d7ca193ab1816037e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-09-09 17:17:53 +00:00 committed by Automerger Merge Worker
commit ec4f0887eb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fuzzing/libfdt_fuzzer.c
View file

@ -55,6 +55,9 @@ static void check_mem(const void *mem, size_t len) {
#endif #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) { static void walk_device_tree(const void *device_tree, int parent_node) {
int len = 0; int len = 0;
@ -64,8 +67,9 @@ static void walk_device_tree(const void *device_tree, int parent_node) {
} }
uint32_t phandle = fdt_get_phandle(device_tree, parent_node); uint32_t phandle = fdt_get_phandle(device_tree, parent_node);
if (phandle != 0) { if (phandle_is_valid(phandle)) {
assert(parent_node == fdt_node_offset_by_phandle(device_tree, 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 // recursively walk the node's children