Caching pointers to device tree nodes or names is not save. The barebox internal device tree may be changed by loading a new device tree or through fixup handlers. Use local copies of the full path instead and resolve the node as needed.
Signed-off-by: Michael Olbrich <[email protected]> --- common/state/backend.c | 3 ++- common/state/state.c | 19 ++++++++++++------- common/state/state.h | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/common/state/backend.c b/common/state/backend.c index 2f2e6dfd32d1..5235bb0283dd 100644 --- a/common/state/backend.c +++ b/common/state/backend.c @@ -164,7 +164,7 @@ int state_backend_init(struct state_backend *backend, struct device_d *dev, if (ret) goto out_free_format; - backend->of_path = of_path; + backend->of_path = xstrdup(of_path); return 0; @@ -185,4 +185,5 @@ void state_backend_free(struct state_backend *backend) state_storage_free(&backend->storage); if (backend->format) state_format_free(backend->format); + free(backend->of_path); } diff --git a/common/state/state.c b/common/state/state.c index 9b1d4edef132..0c329cd67548 100644 --- a/common/state/state.c +++ b/common/state/state.c @@ -202,15 +202,19 @@ struct device_node *state_to_node(struct state *state, enum state_convert conv) { struct device_node *child; - struct device_node *root; + struct device_node *root, *state_root; int ret; - root = of_new_node(parent, state->root->name); + state_root = of_find_node_by_path(state->of_path); + if (!state_root) + return ERR_PTR(-ENODEV); + + root = of_new_node(parent, state_root->name); ret = of_property_write_u32(root, "magic", state->magic); if (ret) goto out; - for_each_child_of_node(state->root, child) { + for_each_child_of_node(state_root, child) { ret = state_convert_node_variable(state, child, root, "", conv); if (ret) goto out; @@ -234,7 +238,7 @@ int state_from_node(struct state *state, struct device_node *node, bool create) if (create) { conv = STATE_CONVERT_FROM_NODE_CREATE; - state->root = node; + state->of_path = xstrdup(node->full_name); state->magic = magic; } else { conv = STATE_CONVERT_FROM_NODE; @@ -291,7 +295,7 @@ static int of_state_fixup(struct device_node *root, void *ctx) int ret; phandle phandle; - node = of_find_node_by_path_from(root, state->root->full_name); + node = of_find_node_by_path_from(root, state->of_path); if (node) { /* replace existing node - it will be deleted later */ parent = node->parent; @@ -299,7 +303,7 @@ static int of_state_fixup(struct device_node *root, void *ctx) char *of_path, *c; /* look for parent, remove last '/' from path */ - of_path = xstrdup(state->root->full_name); + of_path = xstrdup(state->of_path); c = strrchr(of_path, '/'); if (!c) return -ENODEV; @@ -406,6 +410,7 @@ void state_release(struct state *state) list_del(&state->list); unregister_device(&state->dev); state_backend_free(&state->backend); + free(state->of_path); free(state); } @@ -545,7 +550,7 @@ struct state *state_by_node(const struct device_node *node) struct state *state; list_for_each_entry(state, &state_list, list) { - if (state->root == node) + if (!strcmp(state->of_path, node->full_name)) return state; } diff --git a/common/state/state.h b/common/state/state.h index 32146ca1bbc7..7b3e49512e37 100644 --- a/common/state/state.h +++ b/common/state/state.h @@ -87,14 +87,14 @@ struct state_backend_storage { struct state_backend { struct state_backend_format *format; struct state_backend_storage storage; - const char *of_path; + char *of_path; }; struct state { struct list_head list; /* Entry to enqueue on list of states */ struct device_d dev; - struct device_node *root; + char *of_path; const char *name; uint32_t magic; -- 2.9.3 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
