From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752646AbdEMKaK (ORCPT ); Sat, 13 May 2017 06:30:10 -0400 Received: from bbox.sascha.silbe.org ([84.201.25.44]:42407 "EHLO bbox.sascha.silbe.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240AbdEMKaE (ORCPT ); Sat, 13 May 2017 06:30:04 -0400 From: Sascha Silbe To: Rob Herring , Frank Rowand Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] of: fdt: fix unflattening of FDTs containing uncompressed paths Date: Sat, 13 May 2017 12:22:29 +0200 Message-Id: <20170513102229.22579-3-x-linux@infra-silbe.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170513102229.22579-1-x-linux@infra-silbe.de> References: <20170513102229.22579-1-x-linux@infra-silbe.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Probably since commit dfbd4c6eff35 ("drivers/of: Split unflatten_dt_node()"), unflattening an FDT containing uncompressed node names (e.g. "/gpio@d4019000/gpio@0") will abort after scanning the root node because fpsize wasn't updated to include the path len. Signed-off-by: Sascha Silbe --- drivers/of/fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index e5ce4b59e162..2d5414e644b3 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -309,6 +309,8 @@ static unsigned int populate_node(const void *blob, fpsize += l; allocl = fpsize; } + } else { + fpsize += allocl; } np = unflatten_dt_alloc(mem, sizeof(struct device_node) + allocl, -- 2.11.0