LineageOS/android_external_dtc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfdt: Fix bug in fdt_subnode_offset_namelen()

Browse Source 
There's currently an off-by-one bug in fdt_subnode_offset_namelen()
which causes it to keep searching after it's finished the subnodes of
the given parent, and into the subnodes of siblings of the original
node which come after it in the tree.

This patch fixes the bug.  It also extends the subnode_offset testcase
(updating all of the 'test_tree1' example trees in the process) to
catch it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson
2008-10-30 13:41:08 +11:00
committed by Jon Loeliger
parent 2ebe88df69
commit f99cd158a9
9 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libfdt/fdt_ro.c
View File

@@ -108,12 +108,12 @@ int fdt_num_mem_rsv(const void *fdt)
int fdt_subnode_offset_namelen(const void *fdt, int offset,
const char *name, int namelen)
{
int depth;
int depth = 0;
FDT_CHECK_HEADER(fdt);
for (depth = 0;
offset >= 0;
for (depth = 0, offset = fdt_next_node(fdt, offset, &depth);
(offset >= 0) && (depth > 0);
offset = fdt_next_node(fdt, offset, &depth)) {
if (depth < 0)
return -FDT_ERR_NOTFOUND;
@@ -122,7 +122,10 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
return offset;
}
return offset; /* error */
if (offset < 0)
return offset; /* error */
else
return -FDT_ERR_NOTFOUND;
}
int fdt_subnode_offset(const void *fdt, int parentoffset,