Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c

@@ -1765 +1765 @@
   UINT64                                     Value;
   CHAR8                                      **CharArray;
+  UINTN                                      StrLength;
 
   if ((RedfishPlatformConfigPrivate == NULL) || IS_EMPTY_STRING (Schema) || IS_EMPTY_STRING (ConfigureLang) || (StatementValue == NULL)) {
@@ -1772 +1773 @@
   TempBuffer  = NULL;
   StringArray = NULL;
+  StrLength   = 0;
 
   Status = ProcessPendingList (&RedfishPlatformConfigPrivate->FormsetList, &RedfishPlatformConfigPrivate->PendingList);
@@ -1841 +1843 @@
       StatementValue->BufferLen       = TargetStatement->HiiStatement->StorageWidth;
       StatementValue->BufferValueType = TargetStatement->HiiStatement->Value.BufferValueType;
-    } else if ((TargetStatement->HiiStatement->Operand == EFI_IFR_NUMERIC_OP) && (StatementValue->Type == EFI_IFR_TYPE_NUM_SIZE_64)) {
+    } else if (TargetStatement->HiiStatement->Operand == EFI_IFR_NUMERIC_OP) {
+      if (StatementValue->Type == EFI_IFR_TYPE_NUM_SIZE_64) {
+        //
+        // Redfish only has numeric value type and it does not care about the value size.
+        // Do a patch here so we have proper value size applied.
+        //
+        StatementValue->Type = TargetStatement->HiiStatement->Value.Type;
+      }
+
       //
-      // Redfish only has numeric value type and it does not care about the value size.
-      // Do a patch here so we have proper value size applied.
+      // Check maximum and minimum values when they are set.
       //
-      StatementValue->Type = TargetStatement->HiiStatement->Value.Type;
+      if ((TargetStatement->StatementData.NumMaximum > 0) && (TargetStatement->StatementData.NumMaximum >= TargetStatement->StatementData.NumMinimum)) {
+        if (StatementValue->Value.u64 > TargetStatement->StatementData.NumMaximum) {
+          DEBUG ((DEBUG_ERROR, "%a: integer value: %lu is greater than maximum value: %lu\n", __func__, StatementValue->Value.u64, TargetStatement->StatementData.NumMaximum));
+          return EFI_ACCESS_DENIED;
+        } else if (StatementValue->Value.u64 < TargetStatement->StatementData.NumMinimum) {
+          DEBUG ((DEBUG_ERROR, "%a: integer value: %lu is smaller than minimum value: %lu\n", __func__, StatementValue->Value.u64, TargetStatement->StatementData.NumMinimum));
+          return EFI_ACCESS_DENIED;
+        }
+      }
     } else {
       DEBUG ((DEBUG_ERROR, "%a: catch value type mismatch! input type: 0x%x but target value type: 0x%x\n", __func__, StatementValue->Type, TargetStatement->HiiStatement->Value.Type));
@@ -1854 +1871 @@
 
   if ((TargetStatement->HiiStatement->Operand == EFI_IFR_STRING_OP) && (StatementValue->Type == EFI_IFR_TYPE_STRING)) {
+    //
+    // Check string length when length limitation is set.
+    //
+    if ((TargetStatement->StatementData.StrMaxSize > 0) && (TargetStatement->StatementData.StrMaxSize >= TargetStatement->StatementData.StrMinSize)) {
+      StrLength = StrLen ((EFI_STRING)StatementValue->Buffer);
+      if (StrLength > TargetStatement->StatementData.StrMaxSize) {
+        DEBUG ((DEBUG_ERROR, "%a: string length: %u is greater than maximum string length: %u\n", __func__, StrLength, TargetStatement->StatementData.StrMaxSize));
+        return EFI_ACCESS_DENIED;
+      } else if (StrLength < TargetStatement->StatementData.StrMinSize) {
+        DEBUG ((DEBUG_ERROR, "%a: string length: %u is smaller than minimum string length: %u\n", __func__, StrLength, TargetStatement->StatementData.StrMinSize));
+        return EFI_ACCESS_DENIED;
+      }
+    }
+
     //
     // Create string ID for new string.
@@ -2484 +2515 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: locate EFI_HII_STRING_PROTOCOL failure: %r\n", __func__, Status));
+    DEBUG ((DEBUG_INFO, "%a: locate EFI_HII_STRING_PROTOCOL failure: %r\n", __func__, Status));
     return;
   }
@@ -2519 +2550 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: locate EFI_HII_DATABASE_PROTOCOL failure: %r\n", __func__, Status));
+    DEBUG ((DEBUG_INFO, "%a: locate EFI_HII_DATABASE_PROTOCOL failure: %r\n", __func__, Status));
     return;
   }
@@ -2582 +2613 @@
                   );
   if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_ERROR, "%a: locate EFI_REGULAR_EXPRESSION_PROTOCOL failure: %r\n", __func__, Status));
+    DEBUG ((DEBUG_INFO, "%a: locate EFI_REGULAR_EXPRESSION_PROTOCOL failure: %r\n", __func__, Status));
     return;
   }