| From 8f22c4228bbb91697ab3510f5a6176e530c0d639 Mon Sep 17 00:00:00 2001 |
| From: Phil Elwell <phil@raspberrypi.com> |
| Date: Thu, 6 Feb 2020 12:23:15 +0000 |
| Subject: [PATCH] of: overlay: Correct symbol path fixups |
| |
| When symbols from overlays are added to the live tree their paths must |
| be rebased. The translated symbol is normally the result of joining |
| the fragment-relative path (with a leading "/") to the target path |
| (either copied directly from the "target-path" property or resolved |
| from the phandle). This translation fails when the target is the root |
| node (a common case for Raspberry Pi overlays) because the resulting |
| path starts with a double slash. For example, if target-path is "/" and |
| the fragment adds a node called "newnode", the label associated with |
| that node will be assigned the path "//newnode", which can't be found |
| in the tree. |
| |
| Fix the failure case by explicitly replacing a target path of "/" with |
| an empty string. |
| |
| Fixes: d1651b03c2df ("of: overlay: add overlay symbols to live device tree") |
| |
| Signed-off-by: Phil Elwell <phil@raspberrypi.com> |
| --- |
| drivers/of/overlay.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/of/overlay.c |
| +++ b/drivers/of/overlay.c |
| @@ -243,6 +243,8 @@ static struct property *dup_and_fixup_sy |
| if (!target_path) |
| return NULL; |
| target_path_len = strlen(target_path); |
| + if (!strcmp(target_path, "/")) |
| + target_path_len = 0; |
| |
| new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL); |
| if (!new_prop) |