Fix get_node_by_path string equality check
When determining if to recurse into a node, get_node_by_path does not check if the length of each node name is equal. If searching for /foo/baz, this can result in recursing into /foobar because strneq("foo", "foobar", 3) is true. This can result in a reference to /foo/baz to be incorrectly set to /foobar/baz. A test for this was added. Signed-off-by: Tim Montague <tmontague@ghs.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>main
parent
548aea2c43
commit
a10cb3c818
|
@ -478,7 +478,8 @@ struct node *get_node_by_path(struct node *tree, const char *path)
|
||||||
p = strchr(path, '/');
|
p = strchr(path, '/');
|
||||||
|
|
||||||
for_each_child(tree, child) {
|
for_each_child(tree, child) {
|
||||||
if (p && strneq(path, child->name, p-path))
|
if (p && (strlen(child->name) == p-path) &&
|
||||||
|
strneq(path, child->name, p-path))
|
||||||
return get_node_by_path(child, p+1);
|
return get_node_by_path(child, p+1);
|
||||||
else if (!p && streq(path, child->name))
|
else if (!p && streq(path, child->name))
|
||||||
return child;
|
return child;
|
||||||
|
|
|
@ -66,7 +66,7 @@ int main(int argc, char *argv[])
|
||||||
void *fdt;
|
void *fdt;
|
||||||
const char *p;
|
const char *p;
|
||||||
int len, multilen;
|
int len, multilen;
|
||||||
int n1, n2;
|
int n1, n2, n3, n4;
|
||||||
|
|
||||||
test_init(argc, argv);
|
test_init(argc, argv);
|
||||||
fdt = load_blob_arg(argc, argv);
|
fdt = load_blob_arg(argc, argv);
|
||||||
|
@ -92,6 +92,16 @@ int main(int argc, char *argv[])
|
||||||
if ((!streq(p, "/node1") || !streq(p + strlen("/node1") + 1, "/node2")))
|
if ((!streq(p, "/node1") || !streq(p + strlen("/node1") + 1, "/node2")))
|
||||||
FAIL("multiref has wrong value");
|
FAIL("multiref has wrong value");
|
||||||
|
|
||||||
|
/* Check reference to nested nodes with common prefix */
|
||||||
|
n3 = fdt_path_offset(fdt, "/foo/baz");
|
||||||
|
if (n3 < 0)
|
||||||
|
FAIL("fdt_path_offset(/foo/baz): %s", fdt_strerror(n3));
|
||||||
|
n4 = fdt_path_offset(fdt, "/foobar/baz");
|
||||||
|
if (n4 < 0)
|
||||||
|
FAIL("fdt_path_offset(/foobar/baz): %s", fdt_strerror(n4));
|
||||||
|
check_ref(fdt, n3, "/foobar/baz");
|
||||||
|
check_ref(fdt, n4, "/foo/baz");
|
||||||
|
|
||||||
check_rref(fdt);
|
check_rref(fdt);
|
||||||
|
|
||||||
PASS();
|
PASS();
|
||||||
|
|
|
@ -12,4 +12,17 @@
|
||||||
ref = &{/node1}; /* reference after target */
|
ref = &{/node1}; /* reference after target */
|
||||||
lref = &n1;
|
lref = &n1;
|
||||||
};
|
};
|
||||||
|
/* Check references to nested nodes with common prefix */
|
||||||
|
foobar {
|
||||||
|
n3: baz {
|
||||||
|
ref = &{/foo/baz};
|
||||||
|
lref = &n4;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
foo {
|
||||||
|
n4: baz {
|
||||||
|
ref = &{/foobar/baz};
|
||||||
|
lref = &n3;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue