len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-12-06 21:25:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libfdt: Fix NOP handling bug in fdt_add_subnode_namelen()

Browse source 
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>
This commit is contained in:
David Gibson 2008-02-14 16:50:34 +11:00 • committed by Jon Loeliger
parent fc9769ac2b
commit 089adb9964
4 changed files with 91 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libfdt/fdt_rw.c
View file

@ -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;