public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Chen A Chen <chen.a.chen@intel.com>
To: edk2-devel@lists.01.org
Cc: Chen A Chen <chen.a.chen@intel.com>, Ray Ni <ray.ni@intel.com>,
	Eric Dong <eric.dong@intel.com>
Subject: [PATCH] UefiCpuPkg/Microcode.c: Add verification before calculate CheckSum32
Date: Tue,  5 Mar 2019 08:21:18 +0800	[thread overview]
Message-ID: <20190305002118.10572-1-chen.a.chen@intel.com> (raw)

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1020

Should make sure the TotalSize of Microcode is aligned with 4 bytes
before calling CalculateSum32 function.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/Library/MpInitLib/Microcode.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/UefiCpuPkg/Library/MpInitLib/Microcode.c b/UefiCpuPkg/Library/MpInitLib/Microcode.c
index 5f9ae22794..643a6f94f4 100644
--- a/UefiCpuPkg/Library/MpInitLib/Microcode.c
+++ b/UefiCpuPkg/Library/MpInitLib/Microcode.c
@@ -166,20 +166,29 @@ MicrocodeDetect (
     //
     CorrectMicrocode = FALSE;
 
-    //
-    // Save an in-complete CheckSum32 from CheckSum Part1 for common parts.
-    //
     if (MicrocodeEntryPoint->DataSize == 0) {
-      InCompleteCheckSum32 = CalculateSum32 (
-                               (UINT32 *) MicrocodeEntryPoint,
-                               sizeof (CPU_MICROCODE_HEADER) + 2000
-                               );
+      TotalSize = sizeof (CPU_MICROCODE_HEADER) + 2000;
     } else {
-      InCompleteCheckSum32 = CalculateSum32 (
-                               (UINT32 *) MicrocodeEntryPoint,
-                               sizeof (CPU_MICROCODE_HEADER) + MicrocodeEntryPoint->DataSize
-                               );
+      TotalSize = sizeof (CPU_MICROCODE_HEADER) + MicrocodeEntryPoint->DataSize;
     }
+
+    ///
+    /// Check overflow and whether TotalSize is aligned with 4 bytes.
+    ///
+    if ( ((UINTN)MicrocodeEntryPoint + TotalSize) > MicrocodeEnd ||
+         (TotalSize & 0x3) != 0
+       ) {
+      MicrocodeEntryPoint = (CPU_MICROCODE_HEADER *) (((UINTN) MicrocodeEntryPoint) + SIZE_1KB);
+      continue;
+    }
+
+    //
+    // Save an in-complete CheckSum32 from CheckSum Part1 for common parts.
+    //
+    InCompleteCheckSum32 = CalculateSum32 (
+                             (UINT32 *) MicrocodeEntryPoint,
+                             TotalSize
+                             );
     InCompleteCheckSum32 -= MicrocodeEntryPoint->ProcessorSignature.Uint32;
     InCompleteCheckSum32 -= MicrocodeEntryPoint->ProcessorFlags;
     InCompleteCheckSum32 -= MicrocodeEntryPoint->Checksum;
-- 
2.16.2.windows.1



             reply	other threads:[~2019-03-05  0:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05  0:21 Chen A Chen [this message]
2019-03-06  2:15 ` [PATCH] UefiCpuPkg/Microcode.c: Add verification before calculate CheckSum32 Ni, Ray
2019-03-06  5:35   ` Ni, Ray
2019-03-06  5:38     ` Gao, Liming
2019-03-06  5:46       ` Ni, Ray

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190305002118.10572-1-chen.a.chen@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox