[PATCH V2] SecurityPkg TPM2: Assign real copied count in CopyDigestListToBuffer()

[PATCH V2] SecurityPkg TPM2: Assign real copied count in CopyDigestListToBuffer()

[Star Zeng]

In CopyDigestListToBuffer() of Tpm2CommandLib, the count in returned
Buffer should be real copied DigestList count.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
index 43574a246829..be95fd69b3dd 100644
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
@@ -230,8 +230,11 @@ CopyDigestListToBuffer (
 {
   UINTN  Index;
   UINT16 DigestSize;
+  UINT32 DigestListCount;
+  UINT32 *DigestListCountPtr;
 
-  CopyMem (Buffer, &DigestList->count, sizeof(DigestList->count));
+  DigestListCountPtr = (UINT32 *) Buffer;
+  DigestListCount = 0;
   Buffer = (UINT8 *)Buffer + sizeof(DigestList->count);
   for (Index = 0; Index < DigestList->count; Index++) {
     if (!IsHashAlgSupportedInHashAlgorithmMask(DigestList->digests[Index].hashAlg, HashAlgorithmMask)) {
@@ -243,7 +246,9 @@ CopyDigestListToBuffer (
     DigestSize = GetHashSizeFromAlgo (DigestList->digests[Index].hashAlg);
     CopyMem (Buffer, &DigestList->digests[Index].digest, DigestSize);
     Buffer = (UINT8 *)Buffer + DigestSize;
+    DigestListCount++;
   }
+  WriteUnaligned32 (DigestListCountPtr, DigestListCount);
 
   return Buffer;
 }
-- 
2.7.0.windows.1

Re: [PATCH V2] SecurityPkg TPM2: Assign real copied count in CopyDigestListToBuffer()

[Yao, Jiewen]

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Thursday, November 17, 2016 4:06 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH V2] SecurityPkg TPM2: Assign real copied count in
> CopyDigestListToBuffer()
>
> In CopyDigestListToBuffer() of Tpm2CommandLib, the count in returned
> Buffer should be real copied DigestList count.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
> b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
> index 43574a246829..be95fd69b3dd 100644
> --- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
> +++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Help.c
> @@ -230,8 +230,11 @@ CopyDigestListToBuffer (
>  {
>    UINTN  Index;
>    UINT16 DigestSize;
> +  UINT32 DigestListCount;
> +  UINT32 *DigestListCountPtr;
>
> -  CopyMem (Buffer, &DigestList->count, sizeof(DigestList->count));
> +  DigestListCountPtr = (UINT32 *) Buffer;
> +  DigestListCount = 0;
>    Buffer = (UINT8 *)Buffer + sizeof(DigestList->count);
>    for (Index = 0; Index < DigestList->count; Index++) {
>      if
> (!IsHashAlgSupportedInHashAlgorithmMask(DigestList->digests[Index].hashA
> lg, HashAlgorithmMask)) {
> @@ -243,7 +246,9 @@ CopyDigestListToBuffer (
>      DigestSize = GetHashSizeFromAlgo
> (DigestList->digests[Index].hashAlg);
>      CopyMem (Buffer, &DigestList->digests[Index].digest, DigestSize);
>      Buffer = (UINT8 *)Buffer + DigestSize;
> +    DigestListCount++;
>    }
> +  WriteUnaligned32 (DigestListCountPtr, DigestListCount);
>
>    return Buffer;
>  }
> --
> 2.7.0.windows.1