From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8B0111A1E6D for ; Wed, 31 Aug 2016 23:43:09 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 31 Aug 2016 23:42:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,265,1470726000"; d="scan'208";a="163155422" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga004.fm.intel.com with ESMTP; 31 Aug 2016 23:43:00 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 23:42:59 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 23:42:59 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.102]) by shsmsx102.ccr.corp.intel.com ([169.254.2.109]) with mapi id 14.03.0248.002; Thu, 1 Sep 2016 14:42:57 +0800 From: "Long, Qin" To: "Zhang, Chao B" , "edk2-devel@lists.01.org" CC: "Yao, Jiewen" Thread-Topic: [PATCH] SecurityPkg: TPM12CommandLib: Add Response returnCode Check Thread-Index: AQHSAymJ0xuzY4HJ7UKVmIh4EC23vaBkMa/w Date: Thu, 1 Sep 2016 06:42:56 +0000 Message-ID: References: <1472607998-21964-1-git-send-email-chao.b.zhang@intel.com> In-Reply-To: <1472607998-21964-1-git-send-email-chao.b.zhang@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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: Thu, 01 Sep 2016 06:43:09 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Qin Long Best Regards & Thanks, LONG, Qin -----Original Message----- From: Zhang, Chao B=20 Sent: Wednesday, August 31, 2016 9:47 AM To: edk2-devel@lists.01.org Cc: Long, Qin ; Yao, Jiewen ; Zha= ng, Chao B Subject: [PATCH] SecurityPkg: TPM12CommandLib: Add Response returnCode Chec= k Check response return code before return from Tpm12Extend and Tpm12Physi= calPresence. 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/L= ibrary/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; } =20 + if (SwapBytes32(Response.Hdr.returnCode) !=3D TPM_SUCCESS) { + DEBUG ((EFI_D_ERROR, "Tpm12Extend: Response Code error! 0x%08x\r\n", S= wapBytes32(Response.Hdr.returnCode))); + return EFI_DEVICE_ERROR; + } + if (NewPcrValue !=3D 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 =3D SwapBytes32 (TSC_ORD_PhysicalPresence); Command.PhysicalPresence =3D SwapBytes16 (PhysicalPresence); Length =3D sizeof (Response); - return Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command, &Length,= (UINT8 *)&Response); + + Status =3D Tpm12SubmitCommand (sizeof (Command), (UINT8 *)&Command,=20 + &Length, (UINT8 *)&Response); if (EFI_ERROR (Status)) { + return Status; + } + + if (SwapBytes32(Response.returnCode) !=3D TPM_SUCCESS) { + DEBUG ((EFI_D_ERROR, "Tpm12PhysicalPresence: Response Code error! 0x%0= 8x\r\n", SwapBytes32(Response.returnCode))); + return EFI_DEVICE_ERROR; + } + + return EFI_SUCCESS; } -- 1.9.5.msysgit.1