* [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode @ 2017-01-10 18:22 Michael Kinney 2017-01-24 8:19 ` Yao, Jiewen 0 siblings, 1 reply; 3+ messages in thread From: Michael Kinney @ 2017-01-10 18:22 UTC (permalink / raw) To: edk2-devel; +Cc: Chao Zhang, Jiewen Yao 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 <chao.b.zhang@intel.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney <michael.d.kinney@intel.com> --- 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. <BR> +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. <BR> 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. <BR> +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. <BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> 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 <PiPei.h> #include <Library/Tpm12CommandLib.h> #include <Library/BaseLib.h> +#include <Library/DebugLib.h> #include <Library/Tpm12DeviceLib.h> /** @@ -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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode 2017-01-10 18:22 [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode Michael Kinney @ 2017-01-24 8:19 ` Yao, Jiewen 2017-01-24 8:38 ` Zhang, Chao B 0 siblings, 1 reply; 3+ messages in thread From: Yao, Jiewen @ 2017-01-24 8:19 UTC (permalink / raw) To: Kinney, Michael D, edk2-devel@lists.01.org; +Cc: Zhang, Chao B Reviewed-by: Jiewen.yao@intel.com > -----Original Message----- > From: Kinney, Michael D > Sent: Wednesday, January 11, 2017 2:23 AM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B <chao.b.zhang@intel.com>; Yao, Jiewen > <jiewen.yao@intel.com> > Subject: [Patch] SecurityPkg/Tpm12CommandLib: Always check response > returnCode > > 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 <chao.b.zhang@intel.com> > Cc: Jiewen Yao <jiewen.yao@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Michael Kinney <michael.d.kinney@intel.com> > --- > 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. <BR> > +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. <BR> > 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. <BR> > +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. <BR> > (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > 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 <PiPei.h> > #include <Library/Tpm12CommandLib.h> > #include <Library/BaseLib.h> > +#include <Library/DebugLib.h> > #include <Library/Tpm12DeviceLib.h> > > /** > @@ -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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode 2017-01-24 8:19 ` Yao, Jiewen @ 2017-01-24 8:38 ` Zhang, Chao B 0 siblings, 0 replies; 3+ messages in thread From: Zhang, Chao B @ 2017-01-24 8:38 UTC (permalink / raw) To: Yao, Jiewen, Kinney, Michael D, edk2-devel@lists.01.org Reviewed-by : Chao Zhang <chao.b.zhang@intel.com> -----Original Message----- From: Yao, Jiewen Sent: Tuesday, January 24, 2017 4:20 PM To: Kinney, Michael D <michael.d.kinney@intel.com>; edk2-devel@lists.01.org Cc: Zhang, Chao B <chao.b.zhang@intel.com> Subject: RE: [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode Reviewed-by: Jiewen.yao@intel.com > -----Original Message----- > From: Kinney, Michael D > Sent: Wednesday, January 11, 2017 2:23 AM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B <chao.b.zhang@intel.com>; Yao, Jiewen > <jiewen.yao@intel.com> > Subject: [Patch] SecurityPkg/Tpm12CommandLib: Always check response > returnCode > > 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 <chao.b.zhang@intel.com> > Cc: Jiewen Yao <jiewen.yao@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Michael Kinney <michael.d.kinney@intel.com> > --- > 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. <BR> > +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. > +<BR> > 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. <BR> > +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. > +<BR> > (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > 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 <PiPei.h> > #include <Library/Tpm12CommandLib.h> > #include <Library/BaseLib.h> > +#include <Library/DebugLib.h> > #include <Library/Tpm12DeviceLib.h> > > /** > @@ -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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-24 8:38 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-01-10 18:22 [Patch] SecurityPkg/Tpm12CommandLib: Always check response returnCode Michael Kinney 2017-01-24 8:19 ` Yao, Jiewen 2017-01-24 8:38 ` Zhang, Chao B
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox