From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=KxDOLi9D; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by groups.io with SMTP; Fri, 19 Apr 2019 12:28:03 -0700 Received: by mail-wr1-f68.google.com with SMTP id w18so7959794wrv.11 for ; Fri, 19 Apr 2019 12:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DRT1CgEsnNU7T2mDtgz+ld1MStobrOs9UterwOmwsTc=; b=KxDOLi9D25FoztJZH5A+fPGDVQnFvigEHccCfEhtwMvlcllgzeyEg4CVLUSrj2NO99 ViHSHItc25ncNrzxSEAztuvZ64eSvE+pQ+hfuwoV+WKJw+b0EQzfqXgcC9I+Dy2DxtOE Oddtt2BWS47vKBY3tI/wEU7zg07pylBB501c3Tj29lsGmNf5LHsOq1WMIEYY/M8WEFKi b+UQrj0UgLaxJujyG2MyE+Emeg//Br7II16TbgRgJzLAvOe7B2DlW5WX7yFZRd78IZVL mFxeSvWg6C0X4NZNAlUIBC/qK+8VDBkzz02R9ynptb7XD5KtvNGEPg1//ATwpSnD4Ay4 G0hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DRT1CgEsnNU7T2mDtgz+ld1MStobrOs9UterwOmwsTc=; b=gqJOsXhkHJvsuL2F9YIGAIECVVyCCwcTmOZV2ttrhEUr/PrM//CEKd08fzkAAoGwRK Ui2QFPtZ12Ar+Zq/vtcTEU5UNXYA8jZm+0PY6oEFSguiUekU3kobW7n8AntljIYB9IZ7 RI+wgbm75Bv8zX8y5OwGh8gqv7MkShZm7zNm3jlqO4FnUrdWhvyOmVTkq9r6ngIc17nq kliWU65pnL2++JFTQSRIG6ukXJzx30HXDtVHXvXI3bDIeo0VDosuqT3/XMy3gW1oyi0c ww0dfnTHoHbxT/3yqXXy4Zjbm6+RHsjLmdn1d5GIai5c7LDoXKk7r346PaioxMNDbLph lSOw== X-Gm-Message-State: APjAAAUiO9AsBZh+Mnosr+cX1IWQ7j8EkLwTumxw7v6u1MgAGA9RPAnC pW6DM7g7nPJynYyBurX/C8sIwrzXdM8SYTKp X-Google-Smtp-Source: APXvYqyBDYs4+MIOyfv9viHaGMfd1uOwhfy/yxpaTHvN28ub37jfERdw/qstQeHfLwtawLkiAFu31Q== X-Received: by 2002:a5d:6192:: with SMTP id j18mr4170161wru.303.1555702081120; Fri, 19 Apr 2019 12:28:01 -0700 (PDT) Return-Path: Received: from sudo.home ([2a01:cb1d:112:6f00:6d50:e4de:ed13:846f]) by smtp.gmail.com with ESMTPSA id t6sm5102891wrn.3.2019.04.19.12.27.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 12:28:00 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: michael.d.kinney@intel.com, hao.a.wu@intel.com, jian.j.wang@intel.com, Ard Biesheuvel Subject: [PATCH] MdeModulePkg/DxeCapsuleLibFmp: avoid ESRT accesses at runtime Date: Fri, 19 Apr 2019 21:27:21 +0200 Message-Id: <20190419192721.28054-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The DxeCapsuleLibFmp code accesses the ESRT table to decide whether a certain capsule is an FMP capsule. Since the UEFI spec mandates that the ESRT resides in EfiBootServicesData memory, this results in problems at OS runtime, since the firmware implementation itself cannot access memory that has not been virtually remapped. Since we are only interested in the GUIDs, let's cache those at ReadyToBoot so that we retain access to them even after the address space has been virtually remapped. Signed-off-by: Ard Biesheuvel --- Build tested only. MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 18 ++--- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c | 81 +++++++++++++++----- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf | 1 + 3 files changed, 70 insertions(+), 30 deletions(-) diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index f38ab69e38fb..24ff6f420edb 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -41,8 +41,8 @@ #include #include -EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable = NULL; -BOOLEAN mIsVirtualAddrConverted = FALSE; +EFI_GUID *mFmpGuidList; +UINTN mFmpGuidCount; BOOLEAN mDxeCapsuleLibEndOfDxe = FALSE; EFI_EVENT mDxeCapsuleLibEndOfDxeEvent = NULL; @@ -1298,7 +1298,6 @@ IsNestedFmpCapsule ( ) { EFI_STATUS Status; - EFI_SYSTEM_RESOURCE_ENTRY *EsrtEntry; UINTN Index; BOOLEAN EsrtGuidFound; EFI_CAPSULE_HEADER *NestedCapsuleHeader; @@ -1307,14 +1306,11 @@ IsNestedFmpCapsule ( EFI_SYSTEM_RESOURCE_ENTRY Entry; EsrtGuidFound = FALSE; - if (mIsVirtualAddrConverted) { - if(mEsrtTable != NULL) { - EsrtEntry = (EFI_SYSTEM_RESOURCE_ENTRY *)(mEsrtTable + 1); - for (Index = 0; Index < mEsrtTable->FwResourceCount ; Index++, EsrtEntry++) { - if (CompareGuid(&EsrtEntry->FwClass, &CapsuleHeader->CapsuleGuid)) { - EsrtGuidFound = TRUE; - break; - } + if (mFmpGuidCount > 0) { + for (Index = 0; Index < mFmpGuidCount; Index++) { + if (CompareGuid (mFmpGuidList + Index, &CapsuleHeader->CapsuleGuid)) { + EsrtGuidFound = TRUE; + break; } } } else { diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c index 602921d13c06..e75e78202045 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c @@ -20,9 +20,10 @@ #include #include -extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable; -extern BOOLEAN mIsVirtualAddrConverted; +extern EFI_GUID *mFmpGuidList; +extern UINTN mFmpGuidCount; EFI_EVENT mDxeRuntimeCapsuleLibVirtualAddressChangeEvent = NULL; +EFI_EVENT mDxeRuntimeCapsuleLibReadyToBootEvent = NULL; /** Convert EsrtTable physical address to virtual address. @@ -38,37 +39,60 @@ DxeCapsuleLibVirtualAddressChangeEvent ( IN VOID *Context ) { - UINTN Index; - EFI_CONFIGURATION_TABLE *ConfigEntry; + gRT->ConvertPointer (0x0, (VOID **)&mFmpGuidList); +} + +/** + Notify function for event group EFI_EVENT_GROUP_READY_TO_BOOT. This is used to + install the Esrt Table into system configuration table + + @param[in] Event The Event that is being processed. + @param[in] Context The Event Context. + +**/ +STATIC +VOID +EFIAPI +DxeCapsuleLibReadyToBootEventNotify ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + UINTN Index; + EFI_CONFIGURATION_TABLE *ConfigEntry; + EFI_SYSTEM_RESOURCE_TABLE *EsrtTable; + EFI_SYSTEM_RESOURCE_ENTRY *EsrtEntry; // // Get Esrt table first // ConfigEntry = gST->ConfigurationTable; - for (Index = 0; Index < gST->NumberOfTableEntries; Index++) { - if (CompareGuid(&gEfiSystemResourceTableGuid, &ConfigEntry->VendorGuid)) { + EsrtTable = NULL; + for (Index = 0; Index < gST->NumberOfTableEntries; Index++, ConfigEntry++) { + if (CompareGuid (&gEfiSystemResourceTableGuid, &ConfigEntry->VendorGuid)) { + EsrtTable = (EFI_SYSTEM_RESOURCE_TABLE *)ConfigEntry->VendorTable; break; } - ConfigEntry++; } - // - // If no Esrt table installed in Configure Table - // - if (Index < gST->NumberOfTableEntries) { - // - // Search Esrt to check given capsule is qualified - // - mEsrtTable = (EFI_SYSTEM_RESOURCE_TABLE *) ConfigEntry->VendorTable; - + if (EsrtTable == NULL) { // - // Update protocol pointer to Esrt Table. + // No ESRT table was found - close the VA change event, there will + // be nothing to convert. // - gRT->ConvertPointer (0x00, (VOID**) &(mEsrtTable)); + gBS->CloseEvent (mDxeRuntimeCapsuleLibVirtualAddressChangeEvent); + return; } - mIsVirtualAddrConverted = TRUE; + mFmpGuidCount = EsrtTable->FwResourceCount; + mFmpGuidList = AllocateRuntimePool (mFmpGuidCount * sizeof(EFI_GUID)); + ASSERT (mFmpGuidList != NULL); + + EsrtEntry = (EFI_SYSTEM_RESOURCE_ENTRY *)(EsrtTable + 1); + for (Index = 0; Index < mFmpGuidCount; Index++, EsrtEntry++) { + CopyGuid (mFmpGuidList + Index, &EsrtEntry->FwClass); + } } /** @@ -101,6 +125,19 @@ DxeRuntimeCapsuleLibConstructor ( ); ASSERT_EFI_ERROR (Status); + // + // Register notify function to cache the FMP capsule GUIDs at ReadyToBoot. + // + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + DxeCapsuleLibReadyToBootEventNotify, + NULL, + &gEfiEventReadyToBootGuid, + &mDxeRuntimeCapsuleLibReadyToBootEvent + ); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } @@ -127,5 +164,11 @@ DxeRuntimeCapsuleLibDestructor ( Status = gBS->CloseEvent (mDxeRuntimeCapsuleLibVirtualAddressChangeEvent); ASSERT_EFI_ERROR (Status); + // + // Close the ReadyToBoot event. + // + Status = gBS->CloseEvent (mDxeRuntimeCapsuleLibReadyToBootEvent); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf index 700d0d5dcddd..2c93e6870023 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf @@ -66,6 +66,7 @@ gEfiCapsuleReportGuid gEfiCapsuleVendorGuid ## SOMETIMES_CONSUMES ## Variable:L"CapsuleUpdateData" gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event + gEfiEventReadyToBootGuid ## CONSUMES ## Event gEfiEventVirtualAddressChangeGuid ## CONSUMES ## Event [Depex] -- 2.20.1