Skip to content

Commit a9515ff

Browse files
geerturobherring
authored andcommitted
of: overlay: Call of_changeset_init() early
When of_overlay_fdt_apply() fails, the changeset may be partially applied, and the caller is still expected to call of_overlay_remove() to clean up this partial state. However, of_overlay_apply() calls of_resolve_phandles() before init_overlay_changeset(). Hence if the overlay fails to apply due to an unresolved symbol, the overlay_changeset.cset.entries list is still uninitialized, and cleanup will crash with a NULL-pointer dereference in overlay_removal_is_ok(). Fix this by moving the call to of_changeset_init() from init_overlay_changeset() to of_overlay_fdt_apply(), where all other early initialization is done. Fixes: f948d6d ("of: overlay: avoid race condition between applying multiple overlays") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/4f1d6d74b61cba2599026adb6d1948ae559ce91f.1690533838.git.geert+renesas@glider.be Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 500d451 commit a9515ff

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/of/overlay.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,6 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs,
769769
if (!of_node_is_root(ovcs->overlay_root))
770770
pr_debug("%s() ovcs->overlay_root is not root\n", __func__);
771771

772-
of_changeset_init(&ovcs->cset);
773-
774772
cnt = 0;
775773

776774
/* fragment nodes */
@@ -1033,6 +1031,7 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
10331031

10341032
INIT_LIST_HEAD(&ovcs->ovcs_list);
10351033
list_add_tail(&ovcs->ovcs_list, &ovcs_list);
1034+
of_changeset_init(&ovcs->cset);
10361035

10371036
/*
10381037
* Must create permanent copy of FDT because of_fdt_unflatten_tree()

0 commit comments

Comments
 (0)