From: David Gibson <david@gibson.dropbear.id.au>
Date: Thu, 14 Feb 2008 05:50:34 +0000 (+1100)
Subject: libfdt: Fix NOP handling bug in fdt_add_subnode_namelen()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f84d65f9b085ffbed464d1d58e8aaa8f5a2efc07;p=u-boot.git

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.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
index a1c70ff154..ac5019560f 100644
--- a/libfdt/fdt_rw.c
+++ b/libfdt/fdt_rw.c
@@ -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;