From patchwork Tue Apr 4 06:18:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96684 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48268qgd; Mon, 3 Apr 2017 23:18:19 -0700 (PDT) X-Received: by 10.99.149.16 with SMTP id p16mr21768739pgd.112.1491286699116; Mon, 03 Apr 2017 23:18:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.18; Mon, 03 Apr 2017 23:18:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752011AbdDDGSS (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:18 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:33802 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962AbdDDGSS (ORCPT ); Tue, 4 Apr 2017 02:18:18 -0400 Received: by mail-pg0-f52.google.com with SMTP id 21so142764562pgg.1 for ; Mon, 03 Apr 2017 23:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wPWiBRR2YfGVDa/mBMprL/d2J77eMvXTr5UMN/e2Iro=; b=iFMDZRA+Z6za6S0L0YkQ1vndkiKjdvR5/6N7L0QJQpnWQ2M8wAnfUzMgOhiK3ai2Ap Gvyncxbyfgjnp7c3GQnB/v6pwl8iPLVyi7gE2xCeNVCnqeUuD8hx9TRJKXLBcpUmul+q 7bKF8HLNdWOHwMOOQ9fZcYWGLaxLMzgU1fCLo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wPWiBRR2YfGVDa/mBMprL/d2J77eMvXTr5UMN/e2Iro=; b=DdFaqkkTP6ujdjAOOEEoKXOwT0XjD046F3CZkeY45ibhot4uSSppiCzxr0SMqEYyTO nuThg4DLYYJKqf+5sCVcLOoPBKaMcJxcHg3UJ4P39t5LvELIOMccQX5yB29BaX/qbXBN YOqLXH8yGeO/VFdXUUJqCWD+hCk9oe+IHiwy/pNjM2JfaKxZKrhOI0fgQTyH9PnkfY2c gL47Erc5bLJzJrIueOBZ7A5RdI14vi8Fllkulbi2A3+99c9Bn1muKGDp85Y6k6ClIXne YlTzNE3lXsWT0yQX2NYtSNU72aFksbf2aydD2ptvgmQ+TrqMADo7MnyZpwmXBjygnY4r B5CQ== X-Gm-Message-State: AFeK/H2qBtdEr4788vbKugdeno2+UE87KSWh6+IyCm3G7ZhaMavr8gB24tw6M3nNvR24T8Bs X-Received: by 10.84.238.132 with SMTP id v4mr26818028plk.101.1491286697316; Mon, 03 Apr 2017 23:18:17 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id m20sm29331500pgd.32.2017.04.03.23.18.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:16 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Tobias Wolf , Sergei Shtylyov , linux-mips@linux-mips.org, Ralf Baechle Subject: [PATCH 22/33] of: Add check to of_scan_flat_dt() before accessing initial_boot_params Date: Tue, 4 Apr 2017 11:48:01 +0530 Message-Id: <1491286688-31314-3-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286688-31314-1-git-send-email-amit.pundir@linaro.org> References: <1491286688-31314-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tobias Wolf An empty __dtb_start to __dtb_end section might result in initial_boot_params being null for arch/mips/ralink. This showed that the boot process hangs indefinitely in of_scan_flat_dt(). Signed-off-by: Tobias Wolf Cc: Sergei Shtylyov Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14605/ Signed-off-by: Ralf Baechle (cherry picked from commit 3ec754410cb3e931a6c4920b1a150f21a94a2bf4) Signed-off-by: Amit Pundir --- drivers/of/fdt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index c89d5d2..6c07f2c 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -738,9 +738,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, const char *pathp; int offset, rc = 0, depth = -1; - for (offset = fdt_next_node(blob, -1, &depth); - offset >= 0 && depth >= 0 && !rc; - offset = fdt_next_node(blob, offset, &depth)) { + if (!blob) + return 0; + + for (offset = fdt_next_node(blob, -1, &depth); + offset >= 0 && depth >= 0 && !rc; + offset = fdt_next_node(blob, offset, &depth)) { pathp = fdt_get_name(blob, offset, NULL); if (*pathp == '/')