Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751923AbdDOEAI (ORCPT ); Sat, 15 Apr 2017 00:00:08 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34735 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbdDOEAF (ORCPT ); Sat, 15 Apr 2017 00:00:05 -0400 Subject: Re: [PATCH 4/4] of: detect invalid phandle in overlay To: Rob Herring , Stephen Boyd References: <1492228520-12450-1-git-send-email-frowand.list@gmail.com> <1492228520-12450-5-git-send-email-frowand.list@gmail.com> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org From: Frank Rowand Message-ID: <58F19AAC.4010105@gmail.com> Date: Fri, 14 Apr 2017 20:59:40 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1492228520-12450-5-git-send-email-frowand.list@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1071 Lines: 30 Adding Stephen. On 04/14/17 20:55, frowand.list@gmail.com wrote: > 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 > 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 ca0b85f5deb1..20ab49d2f7a4 100644 > --- a/drivers/of/overlay.c > +++ b/drivers/of/overlay.c > @@ -130,6 +130,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); >