REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2443
Replace the ASSERT with the error code return in the TpmPhysicalPresence and GetTpmCapability. Add missing error checking after call TpmPhysicalPresence in TcgPhysicalPresenceLibProcessRequest. Cc: Jiewen Yao <jiewen....@intel.com> Cc: Jian J Wang <jian.j.w...@intel.com> Cc: Chao Zhang <chao.b.zh...@intel.com> Signed-off-by: Zhichao Gao <zhichao....@intel.com> --- .../DxeTcgPhysicalPresenceLib.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c index 14423991f0..7fb2ef9735 100644 --- a/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c +++ b/SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.c @@ -104,9 +104,13 @@ GetTpmCapability ( sizeof (RecvBuffer), (UINT8*)&RecvBuffer ); - ASSERT_EFI_ERROR (Status); - ASSERT (TpmRsp->tag == SwapBytes16 (TPM_TAG_RSP_COMMAND)); - ASSERT (TpmRsp->returnCode == 0); + if (EFI_ERROR (Status)) { + return Status; + } + + if ((TpmRsp->tag != SwapBytes16 (TPM_TAG_RSP_COMMAND)) || (TpmRsp->returnCode != 0)) { + return EFI_DEVICE_ERROR; + } TpmPermanentFlags = (TPM_PERMANENT_FLAGS *)&RecvBuffer[sizeof (TPM_RSP_COMMAND_HDR) + sizeof (UINT32)]; @@ -159,8 +163,14 @@ TpmPhysicalPresence ( sizeof (TpmRsp), (UINT8*)&TpmRsp ); - ASSERT_EFI_ERROR (Status); - ASSERT (TpmRsp.tag == SwapBytes16 (TPM_TAG_RSP_COMMAND)); + if (EFI_ERROR (Status)) { + return Status; + } + + if (TpmRsp.tag != SwapBytes16 (TPM_TAG_RSP_COMMAND)) { + return EFI_DEVICE_ERROR; + } + if (TpmRsp.returnCode != 0) { // // If it fails, some requirements may be needed for this command. @@ -1298,6 +1308,9 @@ TcgPhysicalPresenceLibProcessRequest ( // Set operator physical presence flags // TpmPhysicalPresence (TcgProtocol, TPM_PHYSICAL_PRESENCE_PRESENT); + if (EFI_ERROR (Status)) { + return; + } // // Execute pending TPM request. -- 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#52719): https://edk2.groups.io/g/devel/message/52719 Mute This Topic: https://groups.io/mt/69392342/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-