MdeModulePkg-FPDT(2): Add SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA_BY_OFFSET in FpdtSmm...

[mirror_edk2.git] / MdeModulePkg / Universal / Acpi / FirmwarePerformanceDataTableSmm / FirmwarePerformanceSmm.c

diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
index 73188fb3dfd7cdee2a53a00b8dfe42d1df0d32e3..c750331374487318585339972f07d3e29a8c2ae4 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
+++ b/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
@@ -11,7 +11,7 @@
 \r
   FpdtSmiHandler() will receive untrusted input and do basic validation.\r
 \r
-  Copyright (c) 2011 - 2015, 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
@@ -210,6 +210,7 @@ FpdtSmiHandler (
 {\r
   EFI_STATUS                   Status;\r
   SMM_BOOT_RECORD_COMMUNICATE  *SmmCommData;\r
+  UINTN                        BootRecordOffset;\r
   UINTN                        BootRecordSize;\r
   VOID                         *BootRecordData;\r
   UINTN                        TempCommBufferSize;\r
@@ -238,36 +239,44 @@ FpdtSmiHandler (
 \r
   switch (SmmCommData->Function) {\r
     case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_SIZE :\r
-       SmmCommData->BootRecordSize = mBootRecordSize;\r
-       break;\r
+      SmmCommData->BootRecordSize = mBootRecordSize;\r
+      break;\r
 \r
     case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA :\r
-       BootRecordData = SmmCommData->BootRecordData;\r
-       BootRecordSize = SmmCommData->BootRecordSize;\r
-       if (BootRecordData == NULL || BootRecordSize < mBootRecordSize) {\r
-         Status = EFI_INVALID_PARAMETER;\r
-         break;\r
-       } \r
-\r
-       //\r
-       // Sanity check\r
-       //\r
-       SmmCommData->BootRecordSize = mBootRecordSize;\r
-       if (!SmmIsBufferOutsideSmmValid ((UINTN)BootRecordData, mBootRecordSize)) {\r
-         DEBUG ((EFI_D_ERROR, "FpdtSmiHandler: SMM Data buffer in SMRAM or overflow!\n"));\r
-         Status = EFI_ACCESS_DENIED;\r
-         break;\r
-       }\r
-\r
-       CopyMem (\r
-         (UINT8*)BootRecordData, \r
-         mBootRecordBuffer, \r
-         mBootRecordSize\r
-         );\r
-       break;\r
+      Status = EFI_UNSUPPORTED;\r
+      break;\r
+\r
+    case SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA_BY_OFFSET :\r
+      BootRecordOffset = SmmCommData->BootRecordOffset;\r
+      BootRecordData   = SmmCommData->BootRecordData;\r
+      BootRecordSize   = SmmCommData->BootRecordSize;\r
+      if (BootRecordData == NULL || BootRecordOffset >= mBootRecordSize) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+        break;\r
+      }\r
+      \r
+      //\r
+      // Sanity check\r
+      //\r
+      if (BootRecordSize > mBootRecordSize - BootRecordOffset) {\r
+        BootRecordSize = mBootRecordSize - BootRecordOffset;\r
+      }\r
+      SmmCommData->BootRecordSize = BootRecordSize;\r
+      if (!SmmIsBufferOutsideSmmValid ((UINTN)BootRecordData, BootRecordSize)) {\r
+        DEBUG ((EFI_D_ERROR, "FpdtSmiHandler: SMM Data buffer in SMRAM or overflow!\n"));\r
+        Status = EFI_ACCESS_DENIED;\r
+        break;\r
+      }\r
+      \r
+      CopyMem (\r
+       (UINT8*)BootRecordData, \r
+       mBootRecordBuffer + BootRecordOffset, \r
+       BootRecordSize\r
+       );\r
+      break;\r
 \r
     default:\r
-       Status = EFI_UNSUPPORTED;\r
+      Status = EFI_UNSUPPORTED;\r
   }\r
 \r
   SmmCommData->ReturnStatus = Status;\r