2022-07-15 14:20:25

by Geert Uytterhoeven

Subject: [PATCH 1/2] of: overlay: Move devicetree_corrupt() check up

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 <[email protected]>
---
drivers/of/overlay.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 4044ddcb02c60a58..84a8d402009cb3b2 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -903,12 +903,6 @@ static int of_overlay_apply(struct overlay_changeset *ovcs)
{
int ret = 0, ret_revert, ret_tmp;

- if (devicetree_corrupt()) {
- pr_err("devicetree state suspect, refuse to apply overlay\n");
- ret = -EBUSY;
- goto out;
- }
-
ret = of_resolve_phandles(ovcs->overlay_root);
if (ret)
goto out;
@@ -983,6 +977,11 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,

*ret_ovcs_id = 0;

+ if (devicetree_corrupt()) {
+ pr_err("devicetree state suspect, refuse to apply overlay\n");
+ return -EBUSY;
+ }
+
if (overlay_fdt_size < sizeof(struct fdt_header) ||
fdt_check_header(overlay_fdt)) {
pr_err("Invalid overlay_fdt header\n");
--
2.25.1

2022-07-19 22:05:53

by Rob Herring (Arm)

Subject: Re: [PATCH 1/2] of: overlay: Move devicetree_corrupt() check up

On Fri, 15 Jul 2022 16:03:14 +0200, Geert Uytterhoeven wrote:
> 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 <[email protected]>
> ---
> drivers/of/overlay.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>

Applied, thanks!