Changeset 90804 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/solaris

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.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/solaris

Files:

• VBoxUSB-solaris.c (modified) (2 diffs)
• VBoxUSBMon-solaris.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

@@ -1358 +1358 @@
 #define CHECKRET_MIN_SIZE(mnemonic, cbMin) \
     do { \
-        if (cbData < (cbMin)) \
+        if (RT_UNLIKELY(cbData < (cbMin))) \
         { \
             LogRel((DEVICE_NAME ": vboxUsbSolarisProcessIOCtl: " mnemonic ": cbData=%#zx (%zu) min is %#zx (%zu)\n", \
@@ -1364 +1364 @@
             return VERR_BUFFER_OVERFLOW; \
         } \
-        if ((cbMin) != 0 && !VALID_PTR(pvBuf)) \
+        if (RT_UNLIKELY((cbMin) != 0 && !RT_VALID_PTR(pvBuf))) \
         { \
             LogRel((DEVICE_NAME ": vboxUsbSolarisProcessIOCtl: " mnemonic ": Invalid pointer %p\n", pvBuf)); \

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c

@@ -578 +578 @@
     }
     if (RT_UNLIKELY(   ReqWrap.cbData != 0
-                    && !VALID_PTR(pvBuf)))
+                    && !RT_VALID_PTR(pvBuf)))
     {
         RTMemTmpFree(pvBuf);
@@ -658 +658 @@
 #define CHECKRET_MIN_SIZE(mnemonic, cbMin) \
     do { \
-        if (cbData < (cbMin)) \
+        if (RT_UNLIKELY(cbData < (cbMin))) \
         { \
             LogRel(("vboxUSBSolarisProcessIOCtl: " mnemonic ": cbData=%#zx (%zu) min is %#zx (%zu)\n", \
@@ -664 +664 @@
             return VERR_BUFFER_OVERFLOW; \
         } \
-        if ((cbMin) != 0 && !VALID_PTR(pvData)) \
+        if (RT_UNLIKELY((cbMin) != 0 && !RT_VALID_PTR(pvData))) \
         { \
             LogRel(("vboxUSBSolarisProcessIOCtl: " mnemonic ": Invalid pointer %p\n", pvData)); \