From nobody Mon Apr 29 14:27:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1511154857291369.809140001616; Sun, 19 Nov 2017 21:14:17 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EA747220757FC; Sun, 19 Nov 2017 21:10:01 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5575F220757F9 for ; Sun, 19 Nov 2017 21:10:00 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2017 21:14:13 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.15]) by fmsmga002.fm.intel.com with ESMTP; 19 Nov 2017 21:14:12 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,425,1505804400"; d="scan'208";a="1246241260" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Mon, 20 Nov 2017 13:14:11 +0800 Message-Id: <20171120051411.36284-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.0.gvfs.1.preview.4 Subject: [edk2] [PATCH] MdeModulePkg/UefiBootManagerLib: Remove assertion X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" EfiBootManagerStartHotkeyService() asserts when "BootOptionSupport" variable doesn't exist. In fact, though "BootOptionSupport" variable is set in BdsDxe module, it's possible that the variable is deleted by PlatformBootManagerBeforeConsole(). The patch removes the assertion and adds code to handle the case. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Jiewen Yao Reviewed-by: Jiewen.yao@intel.com --- MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModule= Pkg/Library/UefiBootManagerLib/BmHotkey.c index efad073880..d18ce02eb3 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c @@ -870,13 +870,13 @@ EfiBootManagerStartHotkeyService ( EFI_EVENT Event; UINT32 *BootOptionSupport; =20 - Status =3D GetEfiGlobalVariable2 (EFI_BOOT_OPTION_SUPPORT_VARIABLE_NAME,= (VOID **) &BootOptionSupport, NULL); - ASSERT (BootOptionSupport !=3D NULL); - - if ((*BootOptionSupport & EFI_BOOT_OPTION_SUPPORT_KEY) !=3D 0) { - mBmHotkeySupportCount =3D ((*BootOptionSupport & EFI_BOOT_OPTION_SUPPO= RT_COUNT) >> LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)); + GetEfiGlobalVariable2 (EFI_BOOT_OPTION_SUPPORT_VARIABLE_NAME, (VOID **) = &BootOptionSupport, NULL); + if (BootOptionSupport !=3D NULL) { + if ((*BootOptionSupport & EFI_BOOT_OPTION_SUPPORT_KEY) !=3D 0) { + mBmHotkeySupportCount =3D ((*BootOptionSupport & EFI_BOOT_OPTION_SUP= PORT_COUNT) >> LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)); + } + FreePool (BootOptionSupport); } - FreePool (BootOptionSupport); =20 if (mBmHotkeySupportCount =3D=3D 0) { DEBUG ((EFI_D_INFO, "Bds: BootOptionSupport NV variable forbids starti= ng the hotkey service.\n")); --=20 2.15.0.gvfs.1.preview.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel