Changeset 93283 in vbox

Timestamp:

Jan 17, 2022 7:35:39 PM (3 years ago)

Author:

vboxsync

Message:

Runtime/efi: Fix variable size inconsistencies exposed by endianness conversions.

File:

• trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp

@@ -2066 +2066 @@
     /* Read in the block map and verify it as well. */
     uint64_t cbFvVol = 0;
-    uint16_t cbFvHdr = sizeof(*pFvHdr);
+    uint64_t cbFvHdr = sizeof(*pFvHdr);
     uint64_t offBlockMap = sizeof(*pFvHdr);
     for (;;)
@@ -2513 +2513 @@
         memcpy(&FtwHdr.GuidSignature, &GuidFtwArea, sizeof(GuidFtwArea));
         FtwHdr.fWorkingBlockValid = RT_H2LE_U32(0xfffffffe); /** @todo */
-        FtwHdr.cbWriteQueue       = RT_H2LE_U64(0xfe0); /* This comes from the default OVMF variable volume. */
+        FtwHdr.cbWriteQueue       = RT_H2LE_U64(0xfe0ULL); /* This comes from the default OVMF variable volume. */
         FtwHdr.u32Chksum          = RTCrc32(&FtwHdr, sizeof(FtwHdr));