From patchwork Mon Dec 4 15:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 120568 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4578744qgn; Mon, 4 Dec 2017 07:33:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMYXm88ftF1BMSZFHlNQF1RvbbDAPTt3FA/IfQAbl+/iqYrd3txPbNhtTp8a1LxlgTV1pfVL X-Received: by 10.80.194.145 with SMTP id o17mr30843748edf.59.1512401613715; Mon, 04 Dec 2017 07:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512401613; cv=none; d=google.com; s=arc-20160816; b=IIFeIzQVoKR69TDopGVpQ6hT+10bKZfLi+Fa62N9xG7WIPTimqXiK708VAiKMjk+4B 6E+1TB3UvC3wrGHRtvPdPreNF1d/ag1AYn/oHfeDfYwzYbm3zkSOD+bRplnG1Tj1CjYL 178b+cC3yaJe1nRLlmuvol1RSr+Cqr3No55v8CiM1cBngsf9LmFyAYdvQVLVX09EnfIM g1iAKWrA7xhymwDQOkfEwy/nt1r+uj+5wY9fbpl6T/16dGMKKfDBburKPaEMiJPUpSLL N+GR2laTG8OkrVK9zze66DSoQG/9e07Tc+RD1GJzJwEBlEZVMqvfOibNue3+wMHq/Gb/ jhRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :arc-authentication-results; bh=cJbz1LzdL/MBlzM1BsjS1pLkLq0MA1wRDTzhYhTdj20=; b=VN7Nd3NoFFOSFy1sOjTAyMZth+mEiBrCJlouD0R7rlnR2jR22Bio8lkUc+VVyyeEiV UMAysS1UzDpFet7xnBMFhtM9OJG6d9SzUltPOoyimwWcwK145NTVkxjaz0aBO63rcFLg WmY+KCYP0J1I3PBgmrwyoLv1bzn3jm+eIffbXewcKnTc4eYPDMgLBiVcfHw05OnZNqrg BNOXrzQmQzLWqNDS6FY24gkOxONv6GKZ/uXH8ACxJNIt9VsYakj+gnGFFcF64oYUBaxv MOG5li0iZ1h2NMHBxR/XIskU70vxiJtvmHrwGkgsnplDsi4jXG/ifmwGaEEcER+hTbYm J76A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id i23si4480842edb.243.2017.12.04.07.33.33; Mon, 04 Dec 2017 07:33:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 3915AC21EA5; Mon, 4 Dec 2017 15:33:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BEE31C21E35; Mon, 4 Dec 2017 15:33:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 32FA8C21DA6; Mon, 4 Dec 2017 15:33:28 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id BD423C21E31 for ; Mon, 4 Dec 2017 15:33:27 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0FE14AE9E; Mon, 4 Dec 2017 15:33:27 +0000 (UTC) From: Alexander Graf To: Bin Meng Date: Mon, 4 Dec 2017 16:33:26 +0100 Message-Id: <20171204153326.8232-1-agraf@suse.de> X-Mailer: git-send-email 2.12.3 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] efi_stub: Fix GDT_NOTSYS check X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The get_codeseg32() wants to know if a passed in descriptor has flag GDT_NOTSYS set (desc & GDT_NOTSYS), not whether desc and GDT_NOTSYS are not != 0 (desk && GDT_NOTSYS). This is an obvious typo. Fix it up. Signed-off-by: Alexander Graf Reviewed-by: Bin Meng --- lib/efi/efi_stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 1814960572..9788dedba7 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -182,7 +182,7 @@ static int get_codeseg32(void) << 16; base <<= 12; /* 4KB granularity */ limit <<= 12; - if ((desc & GDT_PRESENT) && (desc && GDT_NOTSYS) && + if ((desc & GDT_PRESENT) && (desc & GDT_NOTSYS) && !(desc & GDT_LONG) && (desc & GDT_4KB) && (desc & GDT_32BIT) && (desc & GDT_CODE) && CONFIG_SYS_TEXT_BASE > base &&