UefiCpuPkg/Application/Cpuid: Add check for gMaximumBasicFunction

[mirror_edk2.git] / UefiCpuPkg / Application / Cpuid / Cpuid.c

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index b05da3ee0ca7ed50f7fb3267bbaf9f348c8b18e4..f5268cd05ed9d3b29d3b0c2db9c74ecc2daba92d 100644 (file)
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -210,8 +210,12 @@ CpuidVersionInfo (
   CPUID_VERSION_INFO_EBX  Ebx;\r
   CPUID_VERSION_INFO_ECX  Ecx;\r
   CPUID_VERSION_INFO_EDX  Edx;\r
-  UINTN                   DisplayFamily;\r
-  UINTN                   DisplayModel;\r
+  UINT32                  DisplayFamily;\r
+  UINT32                  DisplayModel;\r
+\r
+  if (CPUID_VERSION_INFO > gMaximumBasicFunction) {\r
+    return;\r
+  }\r
 \r
   AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx.Uint32);\r
 \r