diff options
| author | Frank Rowand <frank.rowand@sony.com> | 2017-06-21 12:21:56 -0700 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-06-22 11:19:09 -0500 |
| commit | 7a12f459896ae1acf1d826d90b33ecff6f4508c2 (patch) | |
| tree | 18ae78201a398e20307cbf913582451c71bb311c /drivers/of/overlay.c | |
| parent | 7ace5f4806e895b2227f3ebb00d1fe24f60596c4 (diff) | |
| download | linux-stable-7a12f459896ae1acf1d826d90b33ecff6f4508c2.tar.gz linux-stable-7a12f459896ae1acf1d826d90b33ecff6f4508c2.tar.bz2 linux-stable-7a12f459896ae1acf1d826d90b33ecff6f4508c2.zip | |
of: detect invalid phandle in overlay
Overlays are not allowed to modify phandle values of previously existing
nodes because there is no information available to allow fixup up
properties that use the previously existing phandle.
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/overlay.c')
| -rw-r--r-- | drivers/of/overlay.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 7827786718d8..c0e4ee1cd1ba 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -132,6 +132,10 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov, /* NOTE: Multiple mods of created nodes not supported */ tchild = of_get_child_by_name(target, cname); if (tchild != NULL) { + /* new overlay phandle value conflicts with existing value */ + if (child->phandle) + return -EINVAL; + /* apply overlay recursively */ ret = of_overlay_apply_one(ov, tchild, child); of_node_put(tchild); |