From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AFB6B81976 for ; Tue, 10 Jan 2017 10:22:54 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 10 Jan 2017 10:22:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="51454727" Received: from mdkinney-mobl.amr.corp.intel.com ([10.254.91.144]) by orsmga005.jf.intel.com with ESMTP; 10 Jan 2017 10:22:54 -0800 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Chao Zhang , Jiewen Yao Date: Tue, 10 Jan 2017 10:22:51 -0800 Message-Id: <1484072571-6580-1-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 Subject: [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode 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: Tue, 10 Jan 2017 18:22:54 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=338 Update the Tpm12CommandLib to consistently check the returnCode field of a response packet. These checks are missing from the GetCapability and SelfTest commands. The functions Tpm12ContinueSelfTest(), Tpm12GetCapabilityFlagPermanent(), and Tpm12GetCapabilityFlagVolatile() are updated to verify that the response returnCode is not an error. Cc: Chao Zhang Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney --- SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c | 12 +++++++++++- SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c index c33746a..c6eb9e1 100644 --- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c +++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c @@ -1,7 +1,7 @@ /** @file Implement TPM1.2 Get Capabilities related commands. -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -79,6 +79,11 @@ Tpm12GetCapabilityFlagPermanent ( return Status; } + if (SwapBytes32 (Response.Hdr.returnCode) != TPM_SUCCESS) { + DEBUG ((DEBUG_ERROR, "Tpm12GetCapabilityFlagPermanent: Response Code error! 0x%08x\r\n", SwapBytes32 (Response.Hdr.returnCode))); + return EFI_DEVICE_ERROR; + } + ZeroMem (TpmPermanentFlags, sizeof (*TpmPermanentFlags)); CopyMem (TpmPermanentFlags, &Response.Flags, MIN (sizeof (*TpmPermanentFlags), Response.ResponseSize)); @@ -120,6 +125,11 @@ Tpm12GetCapabilityFlagVolatile ( return Status; } + if (SwapBytes32 (Response.Hdr.returnCode) != TPM_SUCCESS) { + DEBUG ((DEBUG_ERROR, "Tpm12GetCapabilityFlagVolatile: Response Code error! 0x%08x\r\n", SwapBytes32 (Response.Hdr.returnCode))); + return EFI_DEVICE_ERROR; + } + ZeroMem (VolatileFlags, sizeof (*VolatileFlags)); CopyMem (VolatileFlags, &Response.Flags, MIN (sizeof (*VolatileFlags), Response.ResponseSize)); diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c index 8e232ee..579fed7 100644 --- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c +++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12SelfTest.c @@ -1,7 +1,7 @@ /** @file Implement TPM1.2 NV Self Test related commands. -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include /** @@ -33,6 +34,7 @@ Tpm12ContinueSelfTest ( VOID ) { + EFI_STATUS Status; TPM_RQU_COMMAND_HDR Command; TPM_RSP_COMMAND_HDR Response; UINT32 Length; @@ -44,5 +46,15 @@ Tpm12ContinueSelfTest ( Command.paramSize = SwapBytes32 (sizeof (Command)); Command.ordinal = SwapBytes32 (TPM_ORD_ContinueSelfTest); 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 ((DEBUG_ERROR, "Tpm12ContinueSelfTest: Response Code error! 0x%08x\r\n", SwapBytes32 (Response.returnCode))); + return EFI_DEVICE_ERROR; + } + + return Status; } -- 2.6.3.windows.1