From nobody Tue May 14 00:34:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76253+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76253+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1623231496; cv=none; d=zohomail.com; s=zohoarc; b=TQjxLMSITGq3qTwYor15VfYKdgXv994Isw6h+ydQJUXzdFnqi3jJsGrPYlsToN925JRl/yfIJc4r91CuHwwyIuIgR8C0YruJC3c5VY0un+b/20XO28O7+LHlKtAmNc4q49dCom4By01B5KCH+hFj9Q8RitNuTNEQhlQEzEuNyBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623231496; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=3wqqH1iek5BmRU3otgE+7T6rJm2Iz5tWwTS9zC+hiNs=; b=gwE/O2P/ZvIz+MmnjKFrCKBvDW0oQQmBseLaYxVgbkUw8JhwsYOZtrLYaHgk8JS7fxc0LjBcX4iFfh6xefNyfKcRH6Sp+NtwAsb+sbkpLsajYOcJLG1/Tq6J2BG2v0hyxV+eAAbG1dnSB+rhvI/vcFoPfK0WS1Oum1a5p/eNucQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76253+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1623231496799709.6494951114249; Wed, 9 Jun 2021 02:38:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lHQqYY1788612x9yH2ZOFBFc; Wed, 09 Jun 2021 02:38:16 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.5480.1623231490565783009 for ; Wed, 09 Jun 2021 02:38:10 -0700 IronPort-SDR: BI4TvCxhdTuhZLspwcgcN0qhOmvVbltvEtGuAiJrhIm0vRw2pumyXftCga2204Sx+OeiCbAPIn Zjbh4jcrdttQ== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="290669774" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="290669774" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 02:38:09 -0700 IronPort-SDR: 5GfSzQBUVc+hjFkz29fy6ZI9hOoAyk8luiwAsrFLqNsYaSa7xmYIQ/fLAtKZ+4AOCKqHSNarLz thw7FvXT+8/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="449886271" X-Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by fmsmga008.fm.intel.com with ESMTP; 09 Jun 2021 02:38:07 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH] MdeModulePkg: Fix device path when the boot manager menu is from different FV Date: Wed, 9 Jun 2021 17:37:08 +0800 Message-Id: <20210609093708.2450-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhiguang.liu@intel.com X-Gm-Message-State: WC9bicvECLQ4ZZDQiGIJifozx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623231496; bh=5hPyZhngB5irvb1/i90qHOG8KTzqt5vQ26BHkMAZu8E=; h=Cc:Date:From:Reply-To:Subject:To; b=GOlS/f5v+vjWUaPkPE3D5aSdfv9nJLZU4C01UPks7KFCUKpU6niL+XivS8C32OEeuh8 FP+BdcqYmrdoRMfVjGJCKmM8lhqBzkfMabdw3c3oRqjPOYliS0ie6+9kgZ/zB/3D+9dKO KTFSYBOkeNuRNWOjVHXxr9fT/uaDQY8kQ4Y= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3441 When the boot manager menu is from different FV, the current logic still us= e the device path of the FV as the module links to this library Cc: Jian J Wang Cc: Hao A Wu Cc: Zhichao Gao Cc: Ray Ni Signed-off-by: Zhiguang Liu Acked-by: Hao A Wu Reviewed-by: Ray Ni --- MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 28 +++-----------------= -------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePk= g/Library/UefiBootManagerLib/BmBoot.c index bef41ae102..95d185b639 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c @@ -2405,13 +2405,9 @@ BmRegisterBootManagerMenu ( CHAR16 *Description; UINTN DescriptionLength; EFI_DEVICE_PATH_PROTOCOL *DevicePath; - EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; - MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode; UINTN HandleCount; EFI_HANDLE *Handles; UINTN Index; - VOID *Data; - UINTN DataSize; =20 DevicePath =3D NULL; Description =3D NULL; @@ -2437,22 +2433,17 @@ BmRegisterBootManagerMenu ( } =20 if (DevicePath =3D=3D NULL) { - Data =3D NULL; - Status =3D GetSectionFromAnyFv ( + Status =3D GetFileDevicePathFromAnyFv ( PcdGetPtr (PcdBootManagerMenuFile), EFI_SECTION_PE32, 0, - (VOID **) &Data, - &DataSize + &DevicePath ); - if (Data !=3D NULL) { - FreePool (Data); - } if (EFI_ERROR (Status)) { DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be fou= nd, skip its boot option registration\n")); return EFI_NOT_FOUND; } - + ASSERT (DevicePath !=3D NULL); // // Get BootManagerMenu application's description from EFI User Interfa= ce Section. // @@ -2466,19 +2457,6 @@ BmRegisterBootManagerMenu ( if (EFI_ERROR (Status)) { Description =3D NULL; } - - EfiInitializeFwVolDevicepathNode (&FileNode, PcdGetPtr (PcdBootManager= MenuFile)); - Status =3D gBS->HandleProtocol ( - gImageHandle, - &gEfiLoadedImageProtocolGuid, - (VOID **) &LoadedImage - ); - ASSERT_EFI_ERROR (Status); - DevicePath =3D AppendDevicePathNode ( - DevicePathFromHandle (LoadedImage->DeviceHandle), - (EFI_DEVICE_PATH_PROTOCOL *) &FileNode - ); - ASSERT (DevicePath !=3D NULL); } =20 Status =3D EfiBootManagerInitializeLoadOption ( --=20 2.30.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76253): https://edk2.groups.io/g/devel/message/76253 Mute This Topic: https://groups.io/mt/83416683/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-