From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5881421959CB2 for ; Wed, 12 Sep 2018 06:22:44 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id k5-v6so2018898wre.10 for ; Wed, 12 Sep 2018 06:22:44 -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:in-reply-to:references; bh=sSkJVwiMxbNQvmkjAopwLMycZ8Yvu67HZtuZip0AVDQ=; b=kXSdRPC3F7ATbtuySn83L+rqmCSd/CZ8+cJpeliZ3BKslXvCZK+MU3AIk4jHDX6q8p D1JrMT07C5yz+lxEhRKZvliTLk7l+7m/sR7IfokQ6Ya+RfidjhX0xCGmK5ylM8wL6kw0 tEgbp3ubeJPW7JenU8XUbwAdONkVwqU+C+i7w= 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:in-reply-to :references; bh=sSkJVwiMxbNQvmkjAopwLMycZ8Yvu67HZtuZip0AVDQ=; b=OWaFV/ZceoG37rdCvF/q/scwZuRfVUxB8VbEgVkkO4VisnIydIgmvA2djXfxegMCbP wLMD8vxzxcBrrQ3fRkNxrImkYdDc/8pPuwIPDJnTXQs1DeprX1sdyvKYldRnZJyR72G4 KEh/jvJLlAQDnIz+KB8MXjaeyLaDMwTGnopSFxcqvX3oo+mPCGqQwxXR8nFDIrTADBsi cwFRUMD9Xq9kPAp9P5k1023H7Y+cmOAs14EFN4CdNWd/OBtu3rAa5iAWCsXuUhfLuIE1 AU2dw+jf6fNdZ8IEuWwnDVB+whxSdmg1bXixGnmyRzqA66qVkLTnQ9oNyREoGrky6Ulr nWtg== X-Gm-Message-State: APzg51Bgv10ETda2zvmRTkDesqT5hXmW/tBdqLPQQJ5av1Zy7aqF7Ehm sAk6wiezi3x1IrbH4PfrZ+orJRG494gXfw== X-Google-Smtp-Source: ANB0VdZZ2LtaFl2LwQZyKsoAprw3aiZ09fLFLatTbAoTLKj3L+PrdhOEmNhJx174K3vhj19jlT+NCA== X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr1596231wrq.156.1536758562420; Wed, 12 Sep 2018 06:22:42 -0700 (PDT) Received: from mba13.kuq.prv ([2001:a62:605:90f4:1f3:d690:1764:36ca]) by smtp.gmail.com with ESMTPSA id e133-v6sm1985129wma.33.2018.09.12.06.22.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 06:22:41 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: agraf@suse.de, Ard Biesheuvel , Zimmer Vincent , Brian Richardson , Michael D Kinney , Andrew Fish , Laszlo Ersek , Leif Lindholm , Star Zeng , Eric Dong , Ruiyu Ni Date: Wed, 12 Sep 2018 15:21:49 +0200 Message-Id: <20180912132151.4258-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912132151.4258-1-ard.biesheuvel@linaro.org> References: <20180912132151.4258-1-ard.biesheuvel@linaro.org> Subject: [PATCH 2/4] MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2018 13:22:44 -0000 When encountering PE/COFF images that cannot be supported natively, attempt to locate an instance of the PE/COFF image emulator protocol, and if it supports the image, proceed with loading it and register it with the emulator. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Core/Dxe/DxeMain.h | 3 ++ MdeModulePkg/Core/Dxe/DxeMain.inf | 1 + MdeModulePkg/Core/Dxe/Image/Image.c | 39 +++++++++++++++++--- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index 7ec82388a3f9..57b3861d9813 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.h +++ b/MdeModulePkg/Core/Dxe/DxeMain.h @@ -53,6 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include #include @@ -229,6 +230,8 @@ typedef struct { UINT16 Machine; /// EBC Protocol pointer EFI_EBC_PROTOCOL *Ebc; + /// PE/COFF Image Emulator Protocol pointer + EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emu; /// Runtime image list EFI_RUNTIME_IMAGE_ENTRY *RuntimeData; /// Pointer to Loaded Image Device Path Protocol diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index 68fa0a01d9bd..d7591aa0da6d 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -180,6 +180,7 @@ gEfiVariableArchProtocolGuid ## CONSUMES gEfiCapsuleArchProtocolGuid ## CONSUMES gEfiWatchdogTimerArchProtocolGuid ## CONSUMES + gEdkiiPeCoffImageEmulatorProtocolGuid ## SOMETIMES_CONSUMES [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index eddca140ee1a..e2dd80790657 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -67,6 +67,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage = { NULL, // JumpContext 0, // Machine NULL, // Ebc + NULL, // Emu NULL, // RuntimeData NULL // LoadedImageDevicePath }; @@ -476,12 +477,23 @@ CoreLoadPeImage ( if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->ImageContext.Machine)) { if (!EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED (Image->ImageContext.Machine)) { // - // The PE/COFF loader can support loading image types that can be executed. - // If we loaded an image type that we can not execute return EFI_UNSUPORTED. + // Locate the emulator protocol to check whether it supports this + // image. // - DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", GetMachineTypeName(Image->ImageContext.Machine))); - DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType))); - return EFI_UNSUPPORTED; + Status = CoreLocateProtocol (&gEdkiiPeCoffImageEmulatorProtocolGuid, + NULL, (VOID **)&Image->Emu); + if (EFI_ERROR (Status) || + !Image->Emu->IsImageSupported (Image->Emu, + Image->ImageContext.Machine, + Image->ImageContext.ImageType)) { + // + // The PE/COFF loader can support loading image types that can be executed. + // If we loaded an image type that we can not execute return EFI_UNSUPORTED. + // + DEBUG ((EFI_D_ERROR, "Image type %s can't be loaded ", GetMachineTypeName(Image->ImageContext.Machine))); + DEBUG ((EFI_D_ERROR, "on %s UEFI system.\n", GetMachineTypeName(mDxeCoreImageMachineType))); + return EFI_UNSUPPORTED; + } } } @@ -687,6 +699,14 @@ CoreLoadPeImage ( if (EFI_ERROR(Status)) { goto Done; } + } else if (Image->Emu != NULL) { + Status = Image->Emu->RegisterImage (Image->Emu, Image->ImageBasePage, + EFI_PAGES_TO_SIZE (Image->NumberOfPages)); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_LOAD | DEBUG_ERROR, + "CoreLoadPeImage: Failed to load register foreign image with emulator.\n")); + goto Done; + } } // @@ -874,6 +894,13 @@ CoreUnloadAndCloseImage ( Image->Ebc->UnloadImage (Image->Ebc, Image->Handle); } + if (Image->Emu != NULL) { + // + // If the PE/COFF Emulator protocol exists we must unregister the image. + // + Image->Emu->UnregisterImage (Image->Emu, Image->ImageBasePage); + } + // // Unload image, free Image->ImageContext->ModHandle // @@ -1599,7 +1626,7 @@ CoreStartImage ( // // The image to be started must have the machine type supported by DxeCore. // - if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine)) { + if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Image->Machine) && Image->Emu == NULL) { // // Do not ASSERT here, because image might be loaded via EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED // But it can not be started. -- 2.17.1