public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] IntelSiliconPkg MicrocodeUpdateDxe: TotalSize must be multiples of 1KB
@ 2018-01-26  3:49 Star Zeng
  2018-01-26  4:01 ` Yao, Jiewen
  0 siblings, 1 reply; 2+ messages in thread
From: Star Zeng @ 2018-01-26  3:49 UTC (permalink / raw)
  To: edk2-devel; +Cc: Star Zeng, Jiewen Yao, Rangasai V Chaganty

TotalSize must be multiples of 1024 bytes (1 KBytes) according to SDM.

Also enhance the debug message for DataSize that must be
multiples of DWORDs.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
index 11a51106fdd2..46b55088285f 100644
--- a/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
+++ b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
@@ -8,7 +8,7 @@
 
   MicrocodeWrite() and VerifyMicrocode() will receive untrusted input and do basic validation.
 
-  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
@@ -421,7 +421,7 @@ VerifyMicrocode (
     return EFI_INCOMPATIBLE_VERSION;
   }
   //
-  // Check Size
+  // Check TotalSize
   //
   if (MicrocodeEntryPoint->DataSize == 0) {
     TotalSize = 2048;
@@ -436,6 +436,14 @@ VerifyMicrocode (
     }
     return EFI_VOLUME_CORRUPTED;
   }
+  if ((TotalSize & (SIZE_1KB - 1)) != 0) {
+    DEBUG((DEBUG_ERROR, "VerifyMicrocode - TotalSize is not multiples of 1024 bytes (1 KBytes)\n"));
+    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
+    if (AbortReason != NULL) {
+      *AbortReason = AllocateCopyPool(sizeof(L"InvalidTotalSize"), L"InvalidTotalSize");
+    }
+    return EFI_VOLUME_CORRUPTED;
+  }
   if (TotalSize != ImageSize) {
     DEBUG((DEBUG_ERROR, "VerifyMicrocode - fail on TotalSize\n"));
     *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
@@ -445,7 +453,7 @@ VerifyMicrocode (
     return EFI_VOLUME_CORRUPTED;
   }
   //
-  // Check CheckSum32
+  // Check DataSize
   //
   if (MicrocodeEntryPoint->DataSize == 0) {
     DataSize = 2048 - sizeof(CPU_MICROCODE_HEADER);
@@ -461,13 +469,16 @@ VerifyMicrocode (
     return EFI_VOLUME_CORRUPTED;
   }
   if ((DataSize & 0x3) != 0) {
-    DEBUG((DEBUG_ERROR, "VerifyMicrocode - DataSize not aligned\n"));
+    DEBUG((DEBUG_ERROR, "VerifyMicrocode - DataSize is not multiples of DWORDs\n"));
     *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
     if (AbortReason != NULL) {
       *AbortReason = AllocateCopyPool(sizeof(L"InvalidDataSize"), L"InvalidDataSize");
     }
     return EFI_VOLUME_CORRUPTED;
   }
+  //
+  // Check CheckSum32
+  //
   CheckSum32 = CalculateSum32((UINT32 *)MicrocodeEntryPoint, DataSize + sizeof(CPU_MICROCODE_HEADER));
   if (CheckSum32 != 0) {
     DEBUG((DEBUG_ERROR, "VerifyMicrocode - fail on CheckSum32\n"));
-- 
2.7.0.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] IntelSiliconPkg MicrocodeUpdateDxe: TotalSize must be multiples of 1KB
  2018-01-26  3:49 [PATCH] IntelSiliconPkg MicrocodeUpdateDxe: TotalSize must be multiples of 1KB Star Zeng
@ 2018-01-26  4:01 ` Yao, Jiewen
  0 siblings, 0 replies; 2+ messages in thread
From: Yao, Jiewen @ 2018-01-26  4:01 UTC (permalink / raw)
  To: Zeng, Star, edk2-devel@lists.01.org

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Friday, January 26, 2018 11:50 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH] IntelSiliconPkg MicrocodeUpdateDxe: TotalSize must be
> multiples of 1KB
> 
> TotalSize must be multiples of 1024 bytes (1 KBytes) according to SDM.
> 
> Also enhance the debug message for DataSize that must be
> multiples of DWORDs.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  .../Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c      | 19
> +++++++++++++++----
>  1 file changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git
> a/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
> b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
> index 11a51106fdd2..46b55088285f 100644
> --- a/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
> +++
> b/IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdate.c
> @@ -8,7 +8,7 @@
> 
>    MicrocodeWrite() and VerifyMicrocode() will receive untrusted input and do
> basic validation.
> 
> -  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
> @@ -421,7 +421,7 @@ VerifyMicrocode (
>      return EFI_INCOMPATIBLE_VERSION;
>    }
>    //
> -  // Check Size
> +  // Check TotalSize
>    //
>    if (MicrocodeEntryPoint->DataSize == 0) {
>      TotalSize = 2048;
> @@ -436,6 +436,14 @@ VerifyMicrocode (
>      }
>      return EFI_VOLUME_CORRUPTED;
>    }
> +  if ((TotalSize & (SIZE_1KB - 1)) != 0) {
> +    DEBUG((DEBUG_ERROR, "VerifyMicrocode - TotalSize is not multiples of
> 1024 bytes (1 KBytes)\n"));
> +    *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
> +    if (AbortReason != NULL) {
> +      *AbortReason = AllocateCopyPool(sizeof(L"InvalidTotalSize"),
> L"InvalidTotalSize");
> +    }
> +    return EFI_VOLUME_CORRUPTED;
> +  }
>    if (TotalSize != ImageSize) {
>      DEBUG((DEBUG_ERROR, "VerifyMicrocode - fail on TotalSize\n"));
>      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
> @@ -445,7 +453,7 @@ VerifyMicrocode (
>      return EFI_VOLUME_CORRUPTED;
>    }
>    //
> -  // Check CheckSum32
> +  // Check DataSize
>    //
>    if (MicrocodeEntryPoint->DataSize == 0) {
>      DataSize = 2048 - sizeof(CPU_MICROCODE_HEADER);
> @@ -461,13 +469,16 @@ VerifyMicrocode (
>      return EFI_VOLUME_CORRUPTED;
>    }
>    if ((DataSize & 0x3) != 0) {
> -    DEBUG((DEBUG_ERROR, "VerifyMicrocode - DataSize not aligned\n"));
> +    DEBUG((DEBUG_ERROR, "VerifyMicrocode - DataSize is not multiples of
> DWORDs\n"));
>      *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
>      if (AbortReason != NULL) {
>        *AbortReason = AllocateCopyPool(sizeof(L"InvalidDataSize"),
> L"InvalidDataSize");
>      }
>      return EFI_VOLUME_CORRUPTED;
>    }
> +  //
> +  // Check CheckSum32
> +  //
>    CheckSum32 = CalculateSum32((UINT32 *)MicrocodeEntryPoint, DataSize +
> sizeof(CPU_MICROCODE_HEADER));
>    if (CheckSum32 != 0) {
>      DEBUG((DEBUG_ERROR, "VerifyMicrocode - fail on CheckSum32\n"));
> --
> 2.7.0.windows.1



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-26  3:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-26  3:49 [PATCH] IntelSiliconPkg MicrocodeUpdateDxe: TotalSize must be multiples of 1KB Star Zeng
2018-01-26  4:01 ` Yao, Jiewen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox