Changeset 90804 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Aug 23, 2021 7:08:53 PM (4 years ago)

Author:

vboxsync

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

146439

Message:

HostDrivers: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

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

@@ -403 +403 @@
      *       careful here and avoid the race.
      */
-    if (   !VALID_PTR(pOverride)
+    if (   !RT_VALID_PTR(pOverride)
         || pOverride->u32Magic != VBOXNETDEVICEOPSOVERRIDE_MAGIC
 # if RTLNX_VER_MIN(2,6,29)
-        || !VALID_PTR(pOverride->pOrgOps)
-# endif /* RTLNX_VER_MIN(2,6,29) */
+        || !RT_VALID_PTR(pOverride->pOrgOps)
+# endif
         )
     {
@@ -427 +427 @@
     pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, cbHdrs, &abHdrBuf[0]);
     if (   pEtherHdr
-        && VALID_PTR(pOverride->pVBoxNetFlt)
+        && RT_VALID_PTR(pOverride->pVBoxNetFlt)
         && (pSwitchPort = pOverride->pVBoxNetFlt->pSwitchPort) != NULL
-        && VALID_PTR(pSwitchPort)
+        && RT_VALID_PTR(pSwitchPort)
         && cbHdrs >= 6)
     {
@@ -458 +458 @@
 
     /* Cancel override if ethtool_ops is missing (host-only case, @bugref{5712}) */
-    if (!VALID_PTR(pDev->OVR_OPS))
+    if (!RT_VALID_PTR(pDev->OVR_OPS))
         return;
     pOverride = RTMemAlloc(sizeof(*pOverride));
@@ -497 +497 @@
     if (!pDev)
         pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
-    if (VALID_PTR(pDev))
+    if (RT_VALID_PTR(pDev))
     {
         pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->OVR_OPS;
-        if (    VALID_PTR(pOverride)
-            &&  pOverride->u32Magic == VBOXNETDEVICEOPSOVERRIDE_MAGIC
-            &&  VALID_PTR(pOverride->pOrgOps)
+        if (   RT_VALID_PTR(pOverride)
+            && pOverride->u32Magic == VBOXNETDEVICEOPSOVERRIDE_MAGIC
+            && RT_VALID_PTR(pOverride->pOrgOps)
            )
         {