Reviewed-by: Long Qin <qin.l...@intel.com> Best Regards & Thanks, LONG, Qin
-----Original Message----- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Zhang, Chao B Sent: Tuesday, March 20, 2018 11:12 PM To: edk2-devel@lists.01.org Cc: Yao, Jiewen <jiewen....@intel.com>; Zhang, Chao B <chao.b.zh...@intel.com>; Long, Qin <qin.l...@intel.com> Subject: [edk2] [Patch] SecurityPkg Tpm12CommandLib: Fix TPM12 GetCapability response error TPM12 command lib doesn't convert Response Size before using. Add logic to fix the issue. Cc: Long Qin <qin.l...@intel.com> Cc: Yao Jiewen <jiewen....@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chao Zhang <chao.b.zh...@intel.com> Signed-off-by: Zhang, Chao B <chao.b.zh...@intel.com> --- SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c b/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c index c6eb9e1050..29d7a13edb 100644 --- a/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c +++ b/SecurityPkg/Library/Tpm12CommandLib/Tpm12GetCapability.c @@ -1,9 +1,9 @@ /** @file Implement TPM1.2 Get Capabilities related commands. -Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved. <BR> +Copyright (c) 2016 - 2018, 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 http://opensource.org/licenses/bsd-license.php @@ -83,11 +83,11 @@ Tpm12GetCapabilityFlagPermanent ( 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)); + CopyMem (TpmPermanentFlags, &Response.Flags, MIN (sizeof + (*TpmPermanentFlags), SwapBytes32(Response.ResponseSize))); return Status; } /** @@ -129,9 +129,9 @@ Tpm12GetCapabilityFlagVolatile ( 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)); + CopyMem (VolatileFlags, &Response.Flags, MIN (sizeof + (*VolatileFlags), SwapBytes32(Response.ResponseSize))); return Status; } -- 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
