From patchwork Tue Jun 30 12:18:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1319813 X-Patchwork-Delegate: xypron.glpk@gmx.de 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=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=K8Uzq9dM; dkim-atps=neutral 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 49x3Lj0g4sz9sR4 for ; Tue, 30 Jun 2020 22:19:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A9CB80280; Tue, 30 Jun 2020 14:18:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="K8Uzq9dM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E82781104; Tue, 30 Jun 2020 14:18:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: ** X-Spam-Status: No, score=2.2 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPOOFED_FREEMAIL, SUBJ_OBFU_PUNCT_FEW,SUBJ_OBFU_PUNCT_MANY,T_SPF_HELO_TEMPERROR, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0B77680226 for ; Tue, 30 Jun 2020 14:18:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1593519513; bh=T4OHV80TU0ieQmRS2Q8zjbfLVjEEyW3yEn2zODwcHwU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=K8Uzq9dMB8y/rQUIRKX999r9FzYM2jNbytldPlMmzCSftFHdX+Zvagb3jVktO23p7 GjQfQ3gHBla52rNGUigkBvhWeAhhNiKkmpZkIbmmD/eGrjF/wVongYqCSSejhK1Hvn gj0XBvuY8h0LDRWVoYyItY3rlW8IBwtCGwnUHCyQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation5.fritz.box ([88.152.145.75]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M2O6e-1joaG71kgo-003yvu; Tue, 30 Jun 2020 14:18:33 +0200 From: Heinrich Schuchardt To: Alexander Graf Cc: Atish Patra , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] efi_loader: incorrect check against FDT_ADDR_T_NONE Date: Tue, 30 Jun 2020 14:18:28 +0200 Message-Id: <20200630121828.163927-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:QpxBT2tfNmya9qv6YNMeqCg268YNZFaEI2vHq1M1EriJbb8RHeX hl8RkfAYlM6JETgTIGtsYc1eHMW1cX3q+cyKngQI42LTgAuwX2Fx+u61YfkFHFFjI3QQWwb Ikvix0Vo0+/1S0JIsTtenIQAsdEtQVEPrvxWTXeGslB+Y+hDzvKD5MkI/iSbQeODiVTC/yZ 5ZZv/YIDlFyYtmgz71KZw== X-UI-Out-Filterresults: notjunk:1;V03:K0:a85aFCd3wUo=:BTrLCA22ZaDst/PGlsXBbJ AGj4i5TpBvyIptXQ8LHYAmd82DiQrkjxjlKb/0u8jscDHRDkCoptpRKcEZo3xe+oj1As3ajEk 1gIZuvugZM2QcnQ6+frziCkjOhC4/enIo3FBTe/XOTYrGrQ5zjIaGkT8PMB4vFbQN81cHgDaC 4KFpmwG5BuJKTB30B0KPWD+pHv2rrRbHgC/eSk3pQEyMt4Xmy/ZaTJFOzNSAh9evodwWOzo8v pCAlxGaM88x54jdTcoZ2lDYphpUQ8bM6Wx187OcWV/vzpfOoHWnG1NCYBEFFp4iW+A8wZiKdf qf7pJtqcunPNIZx2JeTZW3IOxJ9EM79LO8mcOPAAVLUhlxM8q1T6KIElUBIu6aU6E0nIC3XDj bPt/+0TuYcuS4LaprYT6VpTDBxzKbFMJiKjDpPZ+9AzqCW3dL8ZvbC7dnlYfsUd+OaFQl0sZI RUcRCkcawDNxvrSE/3xmWV46W/xfoEmDundmRDa818bIr8Ev0q4fGAJD9849ywyfVQGFZyapE QsDGg8lMzI02Tn2IIiWye3dFDuC2P7gsgyFCawIs2T9YlIa5Kbgb+wB9zoerhkbKULlRRmGxg Uf6p+VOdZ0FkFDAMlmubLFpurg0K8KaPAN65ko/52GMR5cU2+artoJLKkZPvG5X6IiMuYsl2P zmrBD7WFKgyhH3zEMzTWJkuB7uX90dILsoU0P3YHJu/IF4SHD8EFC2JjKBL1BdPlyIJDtOEht py5ITiMNP3PoVpQ2Hfi7qqlSHADV7+YIePU7SMaDHzSsgZ04TeiVPtYPQCemz10Ar+VMCFkw5 wT40hg81k0iYNRrfryN6l/ejwnUUDTgRCTR9Imph9brRZIqky8VOtokzqAmyBlsDB9GNHaJon 2NJiwUpHYQbCcF/zrZ1mMpO9RfnLJulR54N6xySf5vovs1W+98dfCnB+3OUpw/bH7/hxQKx/8 vMDcu5VXRBdhblhRe6d5uuNlXwRJn1OFvo/tAxnPB6nMrPhChjIP/cEtThisuaEQRANATHZSa HBq4DurE4XP+HjduzM523qjwNp7DZbXFqN+3qQI+NI6VPt1m4Y/8Y09tftUay75PUJID01mFq H9K41UbDYP3PqdFJdJtJAQncAjF3xFRFN28LLMvZ5sJEwhwveJpw63tOnuJzs3rhFTP+ttE9a Q0Ri6iq2IUoFVZXnPEZFbeDwNOuSe/nYgXeJW+339HCZ6uqZx83BuENqvc3p7l1niz7hazkZO advGafxsDujyrKF6r X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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 With commit 0d7c2913fdf7 ("cmd: bootefi: Honor the address & size cells properties correctly") addr was replaced by fdt_addr. But not in the check against FDT_ADDR_T_NONE. Fixes: 0d7c2913fdf7 ("cmd: bootefi: Honor the address & size cells properties correctly") Signed-off-by: Heinrich Schuchardt --- cmd/bootefi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 8269153973..57552f99fc 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -200,7 +200,7 @@ static void efi_carve_out_dt_rsv(void *fdt) * The /reserved-memory node may have children with * a size instead of a reg property. */ - if (addr != FDT_ADDR_T_NONE && + if (fdt_addr != FDT_ADDR_T_NONE && fdtdec_get_is_enabled(fdt, subnode)) efi_reserve_memory(fdt_addr, fdt_size); subnode = fdt_next_subnode(fdt, subnode);