Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165275AbdDXFVQ (ORCPT ); Mon, 24 Apr 2017 01:21:16 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:34125 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164464AbdDXFUr (ORCPT ); Mon, 24 Apr 2017 01:20:47 -0400 From: frowand.list@gmail.com To: Rob Herring , stephen.boyd@linaro.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] of: detect invalid phandle in overlay Date: Sun, 23 Apr 2017 22:20:04 -0700 Message-Id: <1493011204-27635-4-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493011204-27635-1-git-send-email-frowand.list@gmail.com> References: <1493011204-27635-1-git-send-email-frowand.list@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 994 Lines: 28 From: Frank Rowand Overlays are not allowed to modify phandle values of previously existing nodes because there is no information available to allow fixup up of properties that use the previously existing phandle. Signed-off-by: Frank Rowand --- drivers/of/overlay.c | 4 ++++ 1 file changed, 4 insertions(+) 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); -- Frank Rowand