From patchwork Wed Dec 2 19:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongwei Zhang X-Patchwork-Id: 1409934 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ami.com Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CmV6q51wtz9sVH for ; Thu, 3 Dec 2020 06:54:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 61B5682705; Wed, 2 Dec 2020 20:54:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ami.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 5D6EC826E3; Wed, 2 Dec 2020 20:48:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from atlmailgw2.ami.com (atlmailgw2.ami.com [63.147.10.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3DF08826E3 for ; Wed, 2 Dec 2020 20:48:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ami.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Hongweiz@ami.com X-AuditID: ac10606f-247ff70000001934-85-5fc7ef793645 Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw2.ami.com (Symantec Messaging Gateway) with SMTP id 7F.27.06452.97FE7CF5; Wed, 2 Dec 2020 14:48:09 -0500 (EST) Received: from ami-us-wk.us.megatrends.com (172.16.98.207) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server (TLS) id 14.3.468.0; Wed, 2 Dec 2020 14:48:09 -0500 From: Hongwei Zhang To: u-boot , Simon Glass CC: Hongwei Zhang , chenshuo , Thirupathaiah Annapureddy , Etienne Carriere , Tero Kristo , =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= , Joel Stanley , Andrew Jeffery Subject: [u-boot, v2019.04-aspeed, v1 1/1] Common:fdt: Check for error return value Date: Wed, 2 Dec 2020 14:47:03 -0500 Message-ID: <20201202194703.8793-2-hongweiz@ami.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201202194703.8793-1-hongweiz@ami.com> References: <20201202194703.8793-1-hongweiz@ami.com> MIME-Version: 1.0 X-Originating-IP: [172.16.98.207] X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRiBhgm7l++PxBsuvmFrsusxhsbbtCpvF pNZuNotVDxayW/w+/5fZ4tuWbYwWS552sFn0nFO2eLu3k92B0+Nq+y52j9kNF1k8dtxdwuhx +vczJo+LH48xe9y5tofN49f2o0weZ+/sYPQ4fmM7UwBnFJdNSmpOZllqkb5dAlfGr6efmAv2 sVas+XSevYFxA0sXIyeHhICJxKVFM9i7GLk4hAR2MUk8urUZLCEksJNRYtr/BBCbTUBNYu/m OUwgtoiAo8SE399ZQRqYBW4zSfS8XccGkhAWCJJYd+4jO4jNIqAi8e7zS2YQmxdoQ9Oro4wQ 2+QlVm84ABTn4OAUMJU4N4cVYpeJxJ6r21ggygUlTs58AmYzC0hIHHzxghmiRlbi1qHHTBBj FCUe/PrOOoFRYBaSlllIWhYwMq1iFEosyclNzMxJLzfSS8zN1EvOz93ECImA/B2MHz+aH2Jk 4mA8xCjBwawkwsvy70i8EG9KYmVValF+fFFpTmrxIUZpDhYlcd5V7kfjhQTSE0tSs1NTC1KL YLJMHJxSDYytbdrtU5h09s9uVXxR0LV1Yp2M2MVgDZZo4fjY9vYZzQY9CW8fy1TX6RRr7Ujp ln8W+HPb1doTWsvDDDl1KyPfn5Y7XnLU980Cf+lLn9gfnNx42kh06dVH91kTw5oPMJbV1D9R CupNlJt/wY/x+c5enYX+udufvrz/4sS6byYtyZNcb/QfeKDEUpyRaKjFXFScCAD/Ygs2bgIA AA== X-Mailman-Approved-At: Wed, 02 Dec 2020 20:54:20 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Check for negative return value of fdt_noffset from calling boot_get_fdt_fit(). Signed-off-by: Hongwei Zhang Reviewed-by: Simon Glass --- common/image-fdt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/image-fdt.c b/common/image-fdt.c index 01186aeac7..52ada56fc1 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -402,6 +402,9 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, &fit_uname_config, arch, &load, &len); + if (fdt_noffset < 0) + goto error; + images->fit_hdr_fdt = map_sysmem(fdt_addr, 0); images->fit_uname_fdt = fit_uname_fdt; images->fit_noffset_fdt = fdt_noffset;