tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 08:34:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg: Check invalid RegisterCpuFeature parameter

Browse Source 
V2:
Update function name, add more detail description.
V1:
Check and assert invalid RegisterCpuFeature function parameter

Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bell Song <binx.song@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Song, BinX 2017-12-13 10:35:15 +08:00 committed by Eric Dong
parent 8a5ef41ebb
commit 5c59537c10
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
View File

@ -71,6 +71,11 @@
#define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9) #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9)
#define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10) #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10)
#define CPU_FEATURE_PPIN (32+11) #define CPU_FEATURE_PPIN (32+11)
//
// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
// If you define a feature bigger than it, please also replace it
// in RegisterCpuFeatureLibIsFeatureValid function.
//
#define CPU_FEATURE_PROC_TRACE (32+12) #define CPU_FEATURE_PROC_TRACE (32+12)
#define CPU_FEATURE_BEFORE_ALL BIT27 #define CPU_FEATURE_BEFORE_ALL BIT27

29
UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
View File

@ -80,6 +80,34 @@ DumpCpuFeature (
} }
} }
/**
Determines if the CPU feature is valid.
@param[in] Feature Pointer to CPU feature
@retval TRUE The CPU feature is valid.
@retval FALSE The CPU feature is invalid.
**/
BOOLEAN
RegisterCpuFeatureLibIsFeatureValid (
IN UINT32 Feature
)
{
UINT32 Data;
Data = Feature;
Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
//
// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
// If you define a feature bigger than it, please replace it at below.
//
if (Data > CPU_FEATURE_PROC_TRACE) {
DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature));
return FALSE;
}
return TRUE;
}
/** /**
Determines if the feature bit mask is in dependent CPU feature bit mask buffer. Determines if the feature bit mask is in dependent CPU feature bit mask buffer.
@ -444,6 +472,7 @@ RegisterCpuFeature (
VA_START (Marker, InitializeFunc); VA_START (Marker, InitializeFunc);
Feature = VA_ARG (Marker, UINT32); Feature = VA_ARG (Marker, UINT32);
ASSERT (RegisterCpuFeatureLibIsFeatureValid(Feature));
while (Feature != CPU_FEATURE_END) { while (Feature != CPU_FEATURE_END) {
ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)) ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER))
!= (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)); != (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER));