diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2008-10-30 13:41:08 +1100 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2008-11-05 08:12:10 -0600 |
| commit | f99cd158a9f0b67d3935a08a07dab4f36719fc74 (patch) | |
| tree | b87b3aba0292863fc909d5d66f7dec6a53b8b005 /libfdt | |
| parent | 2ebe88df6932a3d685e43d921c9beb526129d2be (diff) | |
| download | dtc-f99cd158a9f0b67d3935a08a07dab4f36719fc74.tar.gz | |
libfdt: Fix bug in fdt_subnode_offset_namelen()
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>
Diffstat (limited to 'libfdt')
| -rw-r--r-- | libfdt/fdt_ro.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 6365c26..d12c7ee 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -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, |