\r
SmmPerformanceHandlerEx(), SmmPerformanceHandler() will receive untrusted input and do basic validation.\r
\r
-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
SPIN_LOCK mSmmPerfLock;\r
\r
-EFI_SMRAM_DESCRIPTOR *mSmramRanges;\r
-UINTN mSmramRangeCount;\r
-\r
//\r
// Interfaces for SMM Performance Protocol.\r
//\r
if (GaugeEntryExArray[Index2].EndTimeStamp == 0 &&\r
(GaugeEntryExArray[Index2].Handle == (EFI_PHYSICAL_ADDRESS) (UINTN) Handle) &&\r
AsciiStrnCmp (GaugeEntryExArray[Index2].Token, Token, SMM_PERFORMANCE_STRING_LENGTH) == 0 &&\r
- AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module, SMM_PERFORMANCE_STRING_LENGTH) == 0 &&\r
- (GaugeEntryExArray[Index2].Identifier == Identifier)) {\r
+ AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module, SMM_PERFORMANCE_STRING_LENGTH) == 0) {\r
Index = Index2;\r
break;\r
}\r
GaugeEntryExArray[Index].Handle = (EFI_PHYSICAL_ADDRESS) (UINTN) Handle;\r
\r
if (Token != NULL) {\r
- AsciiStrnCpy (GaugeEntryExArray[Index].Token, Token, SMM_PERFORMANCE_STRING_LENGTH);\r
+ AsciiStrnCpyS (GaugeEntryExArray[Index].Token, SMM_PERFORMANCE_STRING_SIZE, Token, SMM_PERFORMANCE_STRING_LENGTH);\r
}\r
if (Module != NULL) {\r
- AsciiStrnCpy (GaugeEntryExArray[Index].Module, Module, SMM_PERFORMANCE_STRING_LENGTH);\r
+ AsciiStrnCpyS (GaugeEntryExArray[Index].Module, SMM_PERFORMANCE_STRING_SIZE, Module, SMM_PERFORMANCE_STRING_LENGTH);\r
}\r
\r
GaugeEntryExArray[Index].EndTimeStamp = 0;\r
for the first matching record that contains a zero end time and fills in a valid end time.\r
\r
Searches the performance measurement log from the beginning of the log\r
- for the first record that matches Handle, Token, Module and Identifier and has an end time value of zero.\r
+ for the first record that matches Handle, Token and Module and has an end time value of zero.\r
If the record can not be found then return EFI_NOT_FOUND.\r
If the record is found and TimeStamp is not zero,\r
then the end time in the record is filled in with the value specified by TimeStamp.\r
return EFI_SUCCESS;\r
}\r
\r
-/**\r
- This function check if the address is in SMRAM.\r
-\r
- @param Buffer the buffer address to be checked.\r
- @param Length the buffer length to be checked.\r
-\r
- @retval TRUE this address is in SMRAM.\r
- @retval FALSE this address is NOT in SMRAM.\r
-**/\r
-BOOLEAN\r
-IsAddressInSmram (\r
- IN EFI_PHYSICAL_ADDRESS Buffer,\r
- IN UINT64 Length\r
- )\r
-{\r
- UINTN Index;\r
-\r
- for (Index = 0; Index < mSmramRangeCount; Index ++) {\r
- if (((Buffer >= mSmramRanges[Index].CpuStart) && (Buffer < mSmramRanges[Index].CpuStart + mSmramRanges[Index].PhysicalSize)) ||\r
- ((mSmramRanges[Index].CpuStart >= Buffer) && (mSmramRanges[Index].CpuStart < Buffer + Length))) {\r
- return TRUE;\r
- }\r
- }\r
-\r
- return FALSE;\r
-}\r
-\r
/**\r
Communication service SMI Handler entry.\r
\r
EFI_STATUS Status;\r
SMM_PERF_COMMUNICATE_EX *SmmPerfCommData;\r
GAUGE_DATA_ENTRY_EX *GaugeEntryExArray;\r
- UINTN DataSize;\r
+ UINT64 DataSize;\r
+ UINTN Index;\r
+ GAUGE_DATA_ENTRY_EX *GaugeDataEx;\r
+ UINTN NumberOfEntries;\r
+ UINTN LogEntryKey;\r
+ UINTN TempCommBufferSize;\r
\r
GaugeEntryExArray = NULL;\r
\r
return EFI_SUCCESS;\r
}\r
\r
- if(*CommBufferSize < sizeof (SMM_PERF_COMMUNICATE_EX)) {\r
+ TempCommBufferSize = *CommBufferSize;\r
+\r
+ if(TempCommBufferSize < sizeof (SMM_PERF_COMMUNICATE_EX)) {\r
return EFI_SUCCESS;\r
}\r
\r
- if (IsAddressInSmram ((EFI_PHYSICAL_ADDRESS)(UINTN)CommBuffer, *CommBufferSize)) {\r
- DEBUG ((EFI_D_ERROR, "SMM communcation data buffer is in SMRAM!\n"));\r
+ if (!SmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {\r
+ DEBUG ((EFI_D_ERROR, "SmmPerformanceHandlerEx: SMM communcation data buffer in SMRAM or overflow!\n"));\r
return EFI_SUCCESS;\r
}\r
\r
break;\r
\r
case SMM_PERF_FUNCTION_GET_GAUGE_DATA :\r
- if ( SmmPerfCommData->GaugeDataEx == NULL || SmmPerfCommData->NumberOfEntries == 0 ||\r
- (SmmPerfCommData->LogEntryKey + SmmPerfCommData->NumberOfEntries) > mGaugeData->NumberOfEntries) {\r
+ GaugeDataEx = SmmPerfCommData->GaugeDataEx;\r
+ NumberOfEntries = SmmPerfCommData->NumberOfEntries;\r
+ LogEntryKey = SmmPerfCommData->LogEntryKey;\r
+ if (GaugeDataEx == NULL || NumberOfEntries == 0 || LogEntryKey > mGaugeData->NumberOfEntries ||\r
+ NumberOfEntries > mGaugeData->NumberOfEntries || LogEntryKey > (mGaugeData->NumberOfEntries - NumberOfEntries)) {\r
Status = EFI_INVALID_PARAMETER;\r
break;\r
}\r
//\r
// Sanity check\r
//\r
- DataSize = SmmPerfCommData->NumberOfEntries * sizeof(GAUGE_DATA_ENTRY_EX);\r
- if (IsAddressInSmram ((EFI_PHYSICAL_ADDRESS)(UINTN)SmmPerfCommData->GaugeDataEx, DataSize)) {\r
- DEBUG ((EFI_D_ERROR, "SMM Performance Data buffer is in SMRAM!\n"));\r
+ DataSize = MultU64x32 (NumberOfEntries, sizeof(GAUGE_DATA_ENTRY_EX));\r
+ if (!SmmIsBufferOutsideSmmValid ((UINTN) GaugeDataEx, DataSize)) {\r
+ DEBUG ((EFI_D_ERROR, "SmmPerformanceHandlerEx: SMM Performance Data buffer in SMRAM or overflow!\n"));\r
Status = EFI_ACCESS_DENIED;\r
break;\r
}\r
\r
GaugeEntryExArray = (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1);\r
- CopyMem(\r
- (UINT8 *) (SmmPerfCommData->GaugeDataEx),\r
- (UINT8 *) &GaugeEntryExArray[SmmPerfCommData->LogEntryKey],\r
- DataSize\r
- );\r
+\r
+ for (Index = 0; Index < NumberOfEntries; Index++) {\r
+ CopyMem (\r
+ (UINT8 *) &GaugeDataEx[Index],\r
+ (UINT8 *) &GaugeEntryExArray[LogEntryKey++],\r
+ sizeof (GAUGE_DATA_ENTRY_EX)\r
+ );\r
+ }\r
Status = EFI_SUCCESS;\r
break;\r
\r
EFI_STATUS Status;\r
SMM_PERF_COMMUNICATE *SmmPerfCommData;\r
GAUGE_DATA_ENTRY_EX *GaugeEntryExArray;\r
- UINTN DataSize;\r
+ UINT64 DataSize;\r
UINTN Index;\r
+ GAUGE_DATA_ENTRY *GaugeData;\r
+ UINTN NumberOfEntries;\r
UINTN LogEntryKey;\r
- \r
+ UINTN TempCommBufferSize;\r
+\r
GaugeEntryExArray = NULL;\r
\r
//\r
return EFI_SUCCESS;\r
}\r
\r
- if(*CommBufferSize < sizeof (SMM_PERF_COMMUNICATE)) {\r
+ TempCommBufferSize = *CommBufferSize;\r
+\r
+ if(TempCommBufferSize < sizeof (SMM_PERF_COMMUNICATE)) {\r
return EFI_SUCCESS;\r
}\r
\r
- if (IsAddressInSmram ((EFI_PHYSICAL_ADDRESS)(UINTN)CommBuffer, *CommBufferSize)) {\r
- DEBUG ((EFI_D_ERROR, "SMM communcation data buffer is in SMRAM!\n"));\r
+ if (!SmmIsBufferOutsideSmmValid ((UINTN)CommBuffer, TempCommBufferSize)) {\r
+ DEBUG ((EFI_D_ERROR, "SmmPerformanceHandler: SMM communcation data buffer in SMRAM or overflow!\n"));\r
return EFI_SUCCESS;\r
}\r
\r
break;\r
\r
case SMM_PERF_FUNCTION_GET_GAUGE_DATA :\r
- if ( SmmPerfCommData->GaugeData == NULL || SmmPerfCommData->NumberOfEntries == 0 ||\r
- (SmmPerfCommData->LogEntryKey + SmmPerfCommData->NumberOfEntries) > mGaugeData->NumberOfEntries) {\r
+ GaugeData = SmmPerfCommData->GaugeData;\r
+ NumberOfEntries = SmmPerfCommData->NumberOfEntries;\r
+ LogEntryKey = SmmPerfCommData->LogEntryKey;\r
+ if (GaugeData == NULL || NumberOfEntries == 0 || LogEntryKey > mGaugeData->NumberOfEntries ||\r
+ NumberOfEntries > mGaugeData->NumberOfEntries || LogEntryKey > (mGaugeData->NumberOfEntries - NumberOfEntries)) {\r
Status = EFI_INVALID_PARAMETER;\r
break;\r
}\r
//\r
// Sanity check\r
//\r
- DataSize = SmmPerfCommData->NumberOfEntries * sizeof(GAUGE_DATA_ENTRY);\r
- if (IsAddressInSmram ((EFI_PHYSICAL_ADDRESS)(UINTN)SmmPerfCommData->GaugeData, DataSize)) {\r
- DEBUG ((EFI_D_ERROR, "SMM Performance Data buffer is in SMRAM!\n"));\r
+ DataSize = MultU64x32 (NumberOfEntries, sizeof(GAUGE_DATA_ENTRY));\r
+ if (!SmmIsBufferOutsideSmmValid ((UINTN) GaugeData, DataSize)) {\r
+ DEBUG ((EFI_D_ERROR, "SmmPerformanceHandler: SMM Performance Data buffer in SMRAM or overflow!\n"));\r
Status = EFI_ACCESS_DENIED;\r
break;\r
}\r
\r
GaugeEntryExArray = (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1);\r
\r
- LogEntryKey = SmmPerfCommData->LogEntryKey;\r
- for (Index = 0; Index < SmmPerfCommData->NumberOfEntries; Index++) {\r
- CopyMem(\r
- (UINT8 *) &(SmmPerfCommData->GaugeData[Index]),\r
+ for (Index = 0; Index < NumberOfEntries; Index++) {\r
+ CopyMem (\r
+ (UINT8 *) &GaugeData[Index],\r
(UINT8 *) &GaugeEntryExArray[LogEntryKey++],\r
sizeof (GAUGE_DATA_ENTRY)\r
);\r
{\r
EFI_STATUS Status;\r
EFI_HANDLE Handle;\r
- EFI_SMM_ACCESS2_PROTOCOL *SmmAccess;\r
- UINTN Size;\r
-\r
\r
//\r
// Initialize spin lock\r
mGaugeData = AllocateZeroPool (sizeof (GAUGE_DATA_HEADER) + (sizeof (GAUGE_DATA_ENTRY_EX) * mMaxGaugeRecords));\r
ASSERT (mGaugeData != NULL);\r
\r
- //\r
- // Get SMRAM information\r
- //\r
- Status = gBS->LocateProtocol (&gEfiSmmAccess2ProtocolGuid, NULL, (VOID **)&SmmAccess);\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- Size = 0;\r
- Status = SmmAccess->GetCapabilities (SmmAccess, &Size, NULL);\r
- ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
-\r
- Status = gSmst->SmmAllocatePool (\r
- EfiRuntimeServicesData,\r
- Size,\r
- (VOID **)&mSmramRanges\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- Status = SmmAccess->GetCapabilities (SmmAccess, &Size, mSmramRanges);\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- mSmramRangeCount = Size / sizeof (EFI_SMRAM_DESCRIPTOR);\r
-\r
//\r
// Install the protocol interfaces.\r
//\r
for the first matching record that contains a zero end time and fills in a valid end time.\r
\r
Searches the performance measurement log from the beginning of the log\r
- for the first record that matches Handle, Token, Module and Identifier and has an end time value of zero.\r
+ for the first record that matches Handle, Token and Module and has an end time value of zero.\r
If the record can not be found then return RETURN_NOT_FOUND.\r
If the record is found and TimeStamp is not zero,\r
then the end time in the record is filled in with the value specified by TimeStamp.\r
projects / mirror_edk2.git / blobdiff