From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F04851A1E04 for ; Tue, 30 Aug 2016 18:46:41 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP; 30 Aug 2016 18:46:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,259,1470726000"; d="scan'208";a="162699145" Received: from czhan46-mobl.ccr.corp.intel.com ([10.239.196.140]) by fmsmga004.fm.intel.com with ESMTP; 30 Aug 2016 18:46:39 -0700 From: "Zhang, Chao B" To: edk2-devel@lists.01.org Cc: qin.long@intel.com, jiewen.yao@intel.com, Chao Zhang Date: Wed, 31 Aug 2016 09:46:38 +0800 Message-Id: <1472607998-21964-1-git-send-email-chao.b.zhang@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [PATCH] SecurityPkg: TPM12CommandLib: Add Response returnCode Check X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2016 01:46:42 -0000 Check response return code before return from Tpm12Extend and Tpm12PhysicalPresence. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang --- SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c | 5 +++++ .../Library/Tpm12CommandLib/Tpm12PhysicalPresence.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c index 321653f..18d5b96 100644 --- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c +++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12Pcr.c @@ -74,6 +74,11 @@ Tpm12Extend ( return Status; } + if (SwapBytes32(Response.Hdr.returnCode) != TPM_SUCCESS) { + DEBUG ((EFI_D_ERROR, "Tpm12Extend: Response Code error! 0x%08x\r\n", SwapBytes32(Response.Hdr.returnCode))); + return EFI_DEVICE_ERROR; + } + if (NewPcrValue != NULL) { CopyMem (NewPcrValue, &Response.TpmDigest, sizeof (*NewPcrValue)); } diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c index a730334..d8d1998 100644 --- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c +++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12PhysicalPresence.c @@ -44,6 +44,7 @@ Tpm12PhysicalPresence ( IN TPM_PHYSICAL_PRESENCE PhysicalPresence ) { + EFI_STATUS Status; TPM_CMD_PHYSICAL_PRESENCE Command; TPM_RSP_COMMAND_HDR Response; UINT32 Length; @@ -56,5 +57,16 @@ Tpm12PhysicalPresence ( Command.Hdr.ordinal = SwapBytes32 (TSC_ORD_PhysicalPresence); Command.PhysicalPresence = SwapBytes16 (PhysicalPresence); Length = sizeof (Response); - return Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length, (UINT8 *)&Response); + + Status = Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length, (UINT8 *)&Response); + if (EFI_ERROR (Status)) { + return Status; + } + + if (SwapBytes32(Response.returnCode) != TPM_SUCCESS) { + DEBUG ((EFI_D_ERROR, "Tpm12PhysicalPresence: Response Code error! 0x%08x\r\n", SwapBytes32(Response.returnCode))); + return EFI_DEVICE_ERROR; + } + + return EFI_SUCCESS; } -- 1.9.5.msysgit.1