From: Jeff Fan <jeff.fan@intel.com>
Date: Wed, 9 Mar 2016 02:05:30 +0000 (+0800)
Subject: UefiCpuPkg/Application/Cpuid: Add check for gMaximumBasicFunction
X-Git-Tag: edk2-stable201903~7666
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=321ef72c92072eb2d40fac6fee70b94ccbc6e7c0;ds=sidebyside

UefiCpuPkg/Application/Cpuid: Add check for gMaximumBasicFunction

Add check for gMaximumBasicFunction in CpuidVersionInfo () back.

Cc: Qiu Shumin <shumin.qiu@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
---

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 371df66994..f5268cd05e 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -213,6 +213,10 @@ CpuidVersionInfo (
   UINT32                  DisplayFamily;
   UINT32                  DisplayModel;
 
+  if (CPUID_VERSION_INFO > gMaximumBasicFunction) {
+    return;
+  }
+
   AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx.Uint32);
 
   Print (L"CPUID_VERSION_INFO (Leaf %08x)\n", CPUID_VERSION_INFO);