Skip to contentSkip to conversation

libfdt: Fix NOP handling bug in fdt_add_subnode_namelen()

PATCH New Jerry Van Baren 1 participant 1 message Feb 16, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libfdt: Fix NOP handling bug in fdt_add_subnode_namelen()

fdt_add_subnode_namelen() has a bug if asked to add a subnode to a node which has NOP tags interspersed with its properties. In this case fdt_add_subnode_namelen() will put the new subnode before the first NOP tag, even if there are properties after it, which will result in an invalid blob.

This patch fixes the bug, and adds a testcase for it.

---
 libfdt/fdt_rw.c               |    2 +-
 tests/Makefile.tests          |    3 +-
 tests/add_subnode_with_nops.c |   85 +++++++++++++++++++++++++++++++++++++++++
 tests/run_tests.sh            |    3 +
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 tests/add_subnode_with_nops.c
libfdt/fdt_rw.c +1 -1
index a1c70ff..ac50195 100644
@@ -333,7 +333,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
 	do {
 		offset = nextoffset;
 		tag = fdt_next_tag(fdt, offset, &nextoffset);
-	} while (tag == FDT_PROP);
+	} while ((tag == FDT_PROP) || (tag == FDT_NOP));
 
 	nh = _fdt_offset_ptr_w(fdt, offset);
 	nodelen = sizeof(*nh) + ALIGN(namelen+1, FDT_TAGSIZE) + FDT_TAGSIZE;
tests/Makefile.tests +2 -1
index 0f4d342..15a5ebb 100644
@@ -10,7 +10,8 @@ LIB_TESTS_L = get_mem_rsv \
 	move_and_save mangle-layout \
 	open_pack rw_tree1 set_name setprop del_property del_node \
 	string_escapes references path-references \
-	dtbs_equal_ordered
+	dtbs_equal_ordered \
+	add_subnode_with_nops
 LIB_TESTS = $(LIB_TESTS_L:%=$(TESTS_PREFIX)%)
 
 LIBTREE_TESTS_L = truncated_property
tests/add_subnode_with_nops.c new file +85 -0

85 lines not on this page · raw message

tests/run_tests.sh +3 -0
index d04bfbe..02b1fb0 100755
@@ -127,6 +127,9 @@ libfdt_tests () {
 
     # Tests for behaviour on various sorts of corrupted trees
     run_test truncated_property
+
+    # Specific bug tests
+    run_test add_subnode_with_nops
 }
 
 dtc_tests () {
Signature · 1 line
1.5.3.8