Changeset 75687 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Nov 23, 2018 1:19:11 PM (6 years ago)

Author:

vboxsync

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

126883

Message:

VBoxNetFlt: Better assert some darwin alignment assumptions.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFlt.c (modified) (1 diff)
• VBoxNetFltInternal.h (modified) (1 diff)
• darwin/VBoxNetFlt-darwin.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

@@ -1002 +1002 @@
     if (!pNew)
         return VERR_INTNET_FLT_IF_FAILED;
+    AssertMsg(((uintptr_t)pNew & 7) == 0, ("%p LB %#x\n", pNew, RT_UOFFSETOF_DYN(VBOXNETFLTINS, szName[cchName + 1])));
     pNew->pNext                         = NULL;
     pNew->MyPort.u32Version             = INTNETTRUNKIFPORT_VERSION;

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -301 +301 @@
 
 AssertCompileMemberAlignment(VBOXNETFLTINS, NanoTSLastRediscovery, 8);
+AssertCompileMemberAlignment(VBOXNETFLTINS, u, 8);
 #ifdef VBOXNETFLT_OS_SPECFIC
 AssertCompile(RT_SIZEOFMEMB(VBOXNETFLTINS, u.s) <= RT_SIZEOFMEMB(VBOXNETFLTINS, u.abPadding));

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -1071 +1071 @@
     }
 
+    AssertCompileMemberAlignment(VBOXNETFLTINS, u.s.pIfNet, ARCH_BITS / 8);
+    AssertMsg(!((uintptr_t)&pThis->u.s.pIfNet & (ARCH_BITS / 8 - 1)), ("pThis=%p\n", pThis));
     RTSpinlockAcquire(pThis->hSpinlock);
     ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, pIfNet);