From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 72BE42041B26C for ; Tue, 24 Apr 2018 22:51:19 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Apr 2018 22:51:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,325,1520924400"; d="scan'208";a="40320293" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.4]) by fmsmga002.fm.intel.com with ESMTP; 24 Apr 2018 22:51:17 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Star Zeng , Chao B Zhang Date: Wed, 25 Apr 2018 13:51:14 +0800 Message-Id: <20180425055114.40052-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 Subject: [PATCH] MdeModulePkg/Bds: Validate the device path stored in Boot#### X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 05:51:19 -0000 The patch adds additional check to the device path when loading the Boot####/Driver#### variable data. If the device path is invalid, InvalidParameter is returned. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Star Zeng Cc: Chao B Zhang --- MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index 32918caf32..b48a3cbd37 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -1,7 +1,7 @@ /** @file Load option library functions which relate with creating and processing load options. -Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -922,10 +922,14 @@ EfiBootManagerVariableToLoadOptionEx ( VariablePtr += StrSize ((CHAR16 *) VariablePtr); // - // Get the option's device path + // Get the option's device path and validate it. // FilePath = (EFI_DEVICE_PATH_PROTOCOL *) VariablePtr; VariablePtr += FilePathSize; + if (!IsDevicePathValid (FilePath, FilePathSize)) { + FreePool (Variable); + return EFI_INVALID_PARAMETER; + } OptionalDataSize = (UINT32) (VariableSize - ((UINTN) VariablePtr - (UINTN) Variable)); if (OptionalDataSize == 0) { -- 2.16.1.windows.1