linux-stable.git/drivers/of/overlay.c, branch v6.4

of: overlay: Fix missing of_node_put() in error case of init_overlay_changeset()

2023-06-09T22:12:37+00:00

In init_overlay_changeset(), the variable "node" is from
of_get_child_by_name(), and the "node" should be discarded in error case.

Fixes: d1651b03c2df ("of: overlay: add overlay symbols to live device tree")
Signed-off-by: Kunihiko Hayashi 
Link: https://lore.kernel.org/r/20230602020502.11693-1-hayashi.kunihiko@socionext.com
Signed-off-by: Rob Herring

of: overlay: Fix trivial typo

2022-12-26T22:09:29+00:00

Permitted is spelled with two t.

Signed-off-by: Ricardo Ribalda 
Reviewed-by: Philippe Mathieu-Daudé 
Link: https://lore.kernel.org/r/20221220-permited-v1-3-52ea9857fa61@chromium.org
Signed-off-by: Rob Herring

of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()

2022-12-12T01:00:36+00:00

When kmalloc() fail to allocate memory in kasprintf(), fn_1 or fn_2 will
be NULL, and strcmp() will cause null pointer dereference.

Fixes: 2fe0e8769df9 ("of: overlay: check prevents multiple fragments touching same property")
Signed-off-by: ruanjinjie 
Link: https://lore.kernel.org/r/20221211023337.592266-1-ruanjinjie@huawei.com
Signed-off-by: Rob Herring

of: overlay: Simplify of_overlay_fdt_apply() tail

2022-07-19T21:56:48+00:00

It does not hurt to fill in the changeset id while the mutex is still
held.  After doing so, the function tails for the success and failure
cases become identical, so they can be unified.

Signed-off-by: Geert Uytterhoeven 
Reviewed-by: Frank Rowand 
Tested-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/6a3357a8f7f29704350e3ffae768ee8a462b54d3.1657893306.git.geert+renesas@glider.be

of: overlay: Move devicetree_corrupt() check up

2022-07-19T21:56:48+00:00

There is no point in doing several preparatory steps in
of_overlay_fdt_apply(), only to see of_overlay_apply() return early
because of a corrupt device tree.

Move the check for a corrupt device tree from of_overlay_apply() to
of_overlay_fdt_apply(), to check for this as early as possible.

Signed-off-by: Geert Uytterhoeven 
Reviewed-by: Frank Rowand 
Tested-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/c91ce7112eb5167ea46a43d8a980e76b920010ba.1657893306.git.geert+renesas@glider.be

of: overlay: do not free changeset when of_overlay_apply returns error

2022-05-03T16:53:15+00:00

New unittests for overlay notifiers reveal a memory leak in
of_overlay_apply() when a notifier returns an error for action
OF_OVERLAY_POST_APPLY.  The pr_err() message is:

   OF: ERROR: memory leak, expected refcount 1 instead of 3,
   of_node_get()/of_node_put() unbalanced - destroy cset entry: attach
   overlay node /testcase-data/overlay-node/test-bus/test-unittest17

Change the error path to no longer call free_overlay_changeset(),
and document that the caller of of_overlay_fdt_apply() may choose
to remove the overlay.

Update the unittest that triggered the error to expect the changed
return values and to call of_overlay_remove().

Signed-off-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/20220502181742.1402826-4-frowand.list@gmail.com

of: overlay: add entry to of_overlay_action_name[]

2022-05-03T16:53:15+00:00

The values of enum of_overlay_notify_action are used to index into
array of_overlay_action_name.  Add an entry to of_overlay_action_name
for the value recently added to of_overlay_notify_action.

Array of_overlay_action_name[] is moved into include/linux/of.h
adjacent to enum of_overlay_notify_action to make the connection
between the two more obvious if either is modified in the future.

The only use of of_overlay_action_name is for error reporting in
overlay_notify().  All callers of overlay_notify() report the same
error, but with fewer details.  Remove the redundant error reports
in the callers.

Fixes: 067c098766c6 ("of: overlay: rework overlay apply and remove kfree()s")
Reported-by: Dan Carpenter 
Signed-off-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/20220502181742.1402826-2-frowand.list@gmail.com

of: overlay: rework overlay apply and remove kfree()s

2022-04-25T15:56:11+00:00

Fix various kfree() issues related to of_overlay_apply().
  - Double kfree() of fdt and tree when init_overlay_changeset()
    returns an error.
  - free_overlay_changeset() free the root of the unflattened
    overlay (variable tree) instead of the memory that contains
    the unflattened overlay.
  - For the case of a failure during applying an overlay, move kfree()
    of new_fdt and overlay_mem into free_overlay_changeset(), which
    is called by the function that allocated them.
  - For the case of removing an overlay, the kfree() of new_fdt and
    overlay_mem remains in free_overlay_changeset().
  - Check return value of of_fdt_unflatten_tree() for error instead
    of checking the returned value of overlay_root.
  - When storing pointers to allocated objects in ovcs, do so as
    near to the allocation as possible instead of in deeply layered
    function.

More clearly document policy related to lifetime of pointers into
overlay memory.

Double kfree()
Reported-by: Slawomir Stepien 

Signed-off-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/20220420222505.928492-3-frowand.list@gmail.com

of: overlay: rename variables to be consistent

2022-04-25T15:56:01+00:00

Variables change name across function calls when there is not a good
reason to do so.  Fix by changing "fdt" to "new_fdt" and "tree" to
"overlay_root".

The name disparity was confusing when creating the following commit.
The name changes are in this separate commit to make review of the
following commmit less complex.

Signed-off-by: Frank Rowand 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/20220420222505.928492-2-frowand.list@gmail.com

of: overlay: do not break notify on NOTIFY_{OK|STOP}

2022-04-25T13:50:54+00:00

We should not break overlay notifications on NOTIFY_{OK|STOP}
otherwise we might break on the first fragment. We should only stop
notifications if a *real* errno is returned by one of the listeners.

Fixes: a1d19bd4cf1fe ("of: overlay: pr_err from return NOTIFY_OK to overlay apply/remove")
Signed-off-by: Nuno Sá 
Signed-off-by: Rob Herring 
Link: https://lore.kernel.org/r/20220420130205.89435-1-nuno.sa@analog.com