[PATCH 1/2] of: refuse to delete root node of live tree
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: 2021-06-25 14:03:43
Subsystem:
open firmware and flattened device tree, the rest · Maintainers:
Rob Herring, Saravana Kannan, Linus Torvalds
The root node of the live tree should never be deleted, so refuse to do
so and print an error message. Deleting the live tree was possible with
the oftree -f command which was removed in c39c70bac5 ("commands: oftree:
kill oftree -f"). As this no longer exists we also do not need the
of_set_root_node(NULL) part anymore.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/of/base.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 5756f8b60a..551b41fc9e 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c@@ -2441,6 +2441,11 @@ void of_delete_node(struct device_node *node) if (!node) return; + if (node == root_node) { + pr_err("Won't delete root device node\n"); + return; + } + list_for_each_entry_safe(p, pt, &node->properties, list) of_delete_property(p);
@@ -2459,9 +2464,6 @@ void of_delete_node(struct device_node *node) free(node->name); free(node->full_name); free(node); - - if (node == root_node) - of_set_root_node(NULL); } struct device_node *of_get_stdoutpath(void)
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox