Re: [PATCH 1/2] SecurityPkg: Tcg2Dxe: Measure DBT into PCR[7]

["Yao, Jiewen" <jiewen.yao@intel.com>]

Both patch are reviewed-by: Jiewen.yao@Intel.com

> -----Original Message-----
> From: Zhang, Chao B
> Sent: Friday, March 3, 2017 4:39 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 1/2] SecurityPkg: Tcg2Dxe: Measure DBT into PCR[7]
> 
> Measure DBT into PCR[7] in initial measurement phase if present and
> not empty by following TCG PC Client PFP 00.49.
> The previous patch according to 00.21 is removed
> 1404e3a1508473643efba89af34bd133ab082dd5
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 19 ++++++++++++++++++-
>  1 file changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index 1d2ac9a..53de666 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -115,7 +115,6 @@ VARIABLE_TYPE  mVariableType[] = {
>    {EFI_KEY_EXCHANGE_KEY_NAME,    &gEfiGlobalVariableGuid},
>    {EFI_IMAGE_SECURITY_DATABASE,  &gEfiImageSecurityDatabaseGuid},
>    {EFI_IMAGE_SECURITY_DATABASE1, &gEfiImageSecurityDatabaseGuid},
> -  {EFI_IMAGE_SECURITY_DATABASE2, &gEfiImageSecurityDatabaseGuid},
>  };
> 
>  EFI_HANDLE mImageHandle;
> @@ -2137,6 +2136,24 @@ MeasureAllSecureVariables (
>      }
>    }
> 
> +  //
> +  // Measure DBT if present and not empty
> +  //
> +  Status = GetVariable2 (EFI_IMAGE_SECURITY_DATABASE2,
> &gEfiImageSecurityDatabaseGuid, &Data, &DataSize);
> +  if (!EFI_ERROR(Status)) {
> +    Status = MeasureVariable (
> +               7,
> +               EV_EFI_VARIABLE_DRIVER_CONFIG,
> +               EFI_IMAGE_SECURITY_DATABASE2,
> +               &gEfiImageSecurityDatabaseGuid,
> +               Data,
> +               DataSize
> +               );
> +    FreePool(Data);
> +  } else {
> +    DEBUG((DEBUG_INFO, "Skip measuring variable %s since it's deleted\n",
> EFI_IMAGE_SECURITY_DATABASE2));
> +  }
> +
>    return EFI_SUCCESS;
>  }
> 
> --
> 1.9.5.msysgit.1