From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 6512721A16E5F for ; Wed, 17 May 2017 04:39:21 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2017 04:39:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,354,1491289200"; d="scan'208";a="969399175" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.15]) by orsmga003.jf.intel.com with ESMTP; 17 May 2017 04:39:20 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Wed, 17 May 2017 19:39:17 +0800 Message-Id: <20170517113917.172084-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 Subject: [PATCH] MdeModulePkg/BDS: Fix a buffer overflow bug 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: , X-List-Received-Date: Wed, 17 May 2017 11:39:21 -0000 KeyOption points to a buffer holding the content of Key####. So its size is smaller than EFI_BOOT_MANAGER_KEY_OPTION. Old code to assign value to KeyOption->OptionNumber modifies the memory outside of the KeyOption buffer. The patch fixes this bug. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Steven Shi --- MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c index 0f2e677c8a..431be0d8d6 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c @@ -167,7 +167,10 @@ BmCollectKeyOptions ( if (BmIsKeyOptionVariable (Name, Guid, &OptionNumber)) { GetEfiGlobalVariable2 (Name, (VOID**) &KeyOption, &KeyOptionSize); ASSERT (KeyOption != NULL); - KeyOption->OptionNumber = OptionNumber; + // + // Be careful!! KeyOption points to a buffer smaller than EFI_BOOT_MANAGER_KEY_OPTION. + // Do not access KeyOption->OptionNumber. + // if (BmIsKeyOptionValid (KeyOption, KeyOptionSize)) { Param->KeyOptions = ReallocatePool ( Param->KeyOptionCount * sizeof (EFI_BOOT_MANAGER_KEY_OPTION), @@ -179,12 +182,13 @@ BmCollectKeyOptions ( // Insert the key option in order // for (Index = 0; Index < Param->KeyOptionCount; Index++) { - if (KeyOption->OptionNumber < Param->KeyOptions[Index].OptionNumber) { + if (OptionNumber < Param->KeyOptions[Index].OptionNumber) { break; } } CopyMem (&Param->KeyOptions[Index + 1], &Param->KeyOptions[Index], (Param->KeyOptionCount - Index) * sizeof (EFI_BOOT_MANAGER_KEY_OPTION)); CopyMem (&Param->KeyOptions[Index], KeyOption, BmSizeOfKeyOption (KeyOption)); + Param->KeyOptions[Index].OptionNumber = OptionNumber; Param->KeyOptionCount++; } FreePool (KeyOption); -- 2.12.2.windows.2