mirror of https://github.com/acidanthera/audk.git
61a9fa589a
The PeCoffLoaderGetImageInfo() function may return various error codes, such as RETURN_INVALID_PARAMETER and RETURN_UNSUPPORTED. Such error values should not be assigned to our "Status" variable in the DxeImageVerificationHandler() function, because "Status" generally stands for the main exit value of the function. And SECURITY2_FILE_AUTHENTICATION_HANDLER functions are expected to return one of EFI_SUCCESS, EFI_SECURITY_VIOLATION, and EFI_ACCESS_DENIED only. Introduce the "PeCoffStatus" helper variable for keeping the return value of PeCoffLoaderGetImageInfo() internal to the function. If PeCoffLoaderGetImageInfo() fails, we'll jump to the "Done" label with "Status" being EFI_ACCESS_DENIED, inherited from the top of the function. Note that this is consistent with the subsequent PE/COFF Signature check, where we jump to the "Done" label with "Status" having been re-set to EFI_ACCESS_DENIED. As a consequence, we can at once remove the Status = EFI_ACCESS_DENIED; assignment right after the "PeCoffStatus" check. This patch does not change the control flow in the function, it only changes the "Status" outcome from API-incompatible error codes to EFI_ACCESS_DENIED, under some circumstances. Cc: Chao Zhang <chao.b.zhang@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2129 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20200116190705.18816-4-lersek@redhat.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> [lersek@redhat.com: push with Mike's R-b due to Chinese New Year Holiday: <https://edk2.groups.io/g/devel/message/53429>; msgid <d3fbb76dabed4e1987c512c328c82810@intel.com>] |
||
|---|---|---|
| .. | ||
| AuthVariableLib | ||
| DxeImageAuthenticationStatusLib | ||
| DxeImageVerificationLib | ||
| DxeRsa2048Sha256GuidedSectionExtractLib | ||
| DxeTcg2PhysicalPresenceLib | ||
| DxeTcgPhysicalPresenceLib | ||
| DxeTpm2MeasureBootLib | ||
| DxeTpmMeasureBootLib | ||
| DxeTpmMeasurementLib | ||
| FmpAuthenticationLibPkcs7 | ||
| FmpAuthenticationLibRsa2048Sha256 | ||
| HashInstanceLibSha1 | ||
| HashInstanceLibSha256 | ||
| HashInstanceLibSha384 | ||
| HashInstanceLibSha512 | ||
| HashInstanceLibSm3 | ||
| HashLibBaseCryptoRouter | ||
| HashLibTpm2 | ||
| PeiRsa2048Sha256GuidedSectionExtractLib | ||
| PeiTcg2PhysicalPresenceLib | ||
| PlatformSecureLibNull | ||
| SmmTcg2PhysicalPresenceLib | ||
| Tcg2PpVendorLibNull | ||
| TcgPpVendorLibNull | ||
| TcgStorageCoreLib | ||
| TcgStorageOpalLib | ||
| Tpm2CommandLib | ||
| Tpm2DeviceLibDTpm | ||
| Tpm2DeviceLibRouter | ||
| Tpm2DeviceLibTcg2 | ||
| Tpm12CommandLib | ||
| Tpm12DeviceLibDTpm | ||
| Tpm12DeviceLibTcg | ||
| TpmCommLib | ||