Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a12f459 authored by Frank Rowand's avatar Frank Rowand Committed by Rob Herring
Browse files

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: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 7ace5f48

drivers/of/overlay.c

+4 −0
Original line number Diff line number Diff line
@@ -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);