From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catalin Marinas Subject: Re: [PATCH] of/fdt: NULL-terminate the root node path Date: Fri, 16 Nov 2012 15:16:10 +0000 Message-ID: <20121116151610.GF20103@arm.com> References: <1353078878-13566-1-git-send-email-catalin.marinas@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <1353078878-13566-1-git-send-email-catalin.marinas@arm.com> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: "devicetree-discuss@lists.ozlabs.org" Cc: "linux-kernel@vger.kernel.org" , Benjamin Herrenschmidt , "rob.herring@calxeda.com" List-Id: devicetree@vger.kernel.org On Fri, Nov 16, 2012 at 03:14:38PM +0000, Catalin Marinas wrote: > From: Benjamin Herrenschmidt Ah, this shouldn't have been here. git commit -c set the author as well. > Commit 509b7455 (of/fdt: Don't copy garbage after "/" in root node path) > sets the path length to 0 to ignore any garbage after "/" in the root > node path. This has the side effect of also ignoring '\0' at the end of > the root node path. This patch sets the ignores the garbage by setting > the last character to '\0' and length to 1. > > Signed-off-by: Catalin Marinas > Cc: Benjamin Herrenschmidt > Cc: Rob Herring > --- > > The patch is against linux-next, not sure whether mainline will get the > same commit number. Please feel free to fold it into the original patch, > whichever is easier. Without this I can't boot arm64, doesn't populate > the platform devices. > > drivers/of/fdt.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index 73fb8c0..d9b2207 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -186,7 +186,8 @@ static unsigned long unflatten_dt_node(struct boot_param_header *blob, > */ > fpsize = 1; > allocl = 2; > - l = 0; > + l = 1; > + *pathp = '\0'; > } else { > /* account for '/' and path size minus terminal 0 > * already in 'l'