Changeset 44605 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Feb 8, 2013 3:20:52 PM (12 years ago)

Author:

vboxsync

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

83690

Message:

Some fixes and instrumentation

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (2 diffs)
• Firmware2/VBoxPkg/VBoxVariable/InitVariable.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -412 +412 @@
         pThis->NVRAM.pCurVar              = pEfiVar;
         pThis->NVRAM.u32Status            = EFI_VARIABLE_OP_STATUS_OK;
-        LogFlow(("EFI: Variable query -> %RTuuid::'%s' abValue=%.*Rhxs\n", &pThis->NVRAM.VarOpBuf.uuid,
-                 pThis->NVRAM.VarOpBuf.szName, pThis->NVRAM.VarOpBuf.cbValue, pThis->NVRAM.VarOpBuf.abValue));
+        LogFlow(("EFI: Variable query -> %RTuuid::'%s' (%d) abValue=%.*Rhxs\n", &pThis->NVRAM.VarOpBuf.uuid,
+                 pThis->NVRAM.VarOpBuf.szName, pThis->NVRAM.VarOpBuf.cchName,
+                 pThis->NVRAM.VarOpBuf.cbValue, pThis->NVRAM.VarOpBuf.abValue));
     }
     else
@@ -773 +774 @@
         case EFI_VM_VARIABLE_OP_NAME_UTF16:
             /* Lazy bird: ASSUME no surrogate pairs. */
-            if (pThis->NVRAM.offOpBuffer < pThis->NVRAM.VarOpBuf.cchName)
+            if (pThis->NVRAM.offOpBuffer <= pThis->NVRAM.VarOpBuf.cchName && cb == 2)
             {
                 char const *psz1 = &pThis->NVRAM.VarOpBuf.szName[pThis->NVRAM.offOpBuffer];
-                char const *psz2 = psz2;
+                char const *psz2 = psz1;
                 RTUNICP Cp;
                 RTStrGetCpEx(&psz2, &Cp);
                 *pu32 = Cp;
+                Log2(("EFI_VM_VARIABLE_OP_NAME_UTF16[%u] => %#x (+%d)\n", pThis->NVRAM.offOpBuffer, *pu32, psz2 - psz1));
                 pThis->NVRAM.offOpBuffer += psz2 - psz1;
             }
-            else if (pThis->NVRAM.offOpBuffer == pThis->NVRAM.VarOpBuf.cchName)
-            {
-                *pu32 = 0;
-                pThis->NVRAM.offOpBuffer++;
-            }
             else
             {
-                if (cb == 1)
+                if (cb == 2)
                     LogRel(("EFI: Out of bounds EFI_VM_VARIABLE_OP_NAME_UTF16 read.\n"));
                 else

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVariable/InitVariable.c

@@ -148 +148 @@
      * Tell DevEFI to look for the specified variable.
      */
-    ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_GUID);
     VBoxWriteNVRAMGuidParam(VendorGuid);
     VBoxWriteNVRAMNameParam(VariableName);
-
     u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY);
     if (u32Rc == EFI_VARIABLE_OP_STATUS_OK)
@@ -232 +230 @@
     LogFlowFuncEnter();
 
+    if (!VariableNameSize || !VariableName || !VendorGuid)
+    {
+        LogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
+        return EFI_INVALID_PARAMETER;
+    }
+
     /* 
      * Tell DevEFI which the current variable is, then ask for the next one.
@@ -245 +249 @@
     if (u32Rc == EFI_VARIABLE_OP_STATUS_OK)
         u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY_NEXT);
+    /** @todo We're supposed to skip stuff depending on attributes and
+     *        runtime/boottime, at least if EmuGetNextVariableName is something
+     *        to go by... */
 
     if (u32Rc == EFI_VARIABLE_OP_STATUS_OK)
@@ -254 +261 @@
         ASMOutU32(EFI_VARIABLE_OP, EFI_VM_VARIABLE_OP_NAME_LENGTH_UTF16);
         cwcName = ASMInU32(EFI_VARIABLE_OP);
-        if (cwcName * 2 < *VariableNameSize) /* ASSUMES byte size is specified */
+        if ((cwcName + 1) * 2 <= *VariableNameSize) /* ASSUMES byte size is specified */
         {
             UINT32 i;
@@ -269 +276 @@
             VariableName[i] = '\0';
 
-            *VariableNameSize = cwcName * 2;
             rc = EFI_SUCCESS;
         }
         else
-        {
             rc = EFI_BUFFER_TOO_SMALL;
-            *VariableNameSize = (cwcName + 1) * 2;
-        }
+        *VariableNameSize = (cwcName + 1) * 2;
     }
     else
@@ -282 +286 @@
 
     LogFlowFuncLeaveRC(rc);
+    // Temporary - start
+    DebugPrint("GetNextVariableName: rc=%u cbName=%u Name=%s VendorGuid=%g\n", rc, *VariableNameSize, VariableName, VendorGuid);
+    // Temporary - end
     return rc;
 #endif