Changeset 40612 in vbox

Timestamp:

Mar 25, 2012 1:17:03 AM (13 years ago)

Author:

vboxsync

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

77024

Message:

SUPDrv-dtrace.cpp: bugfixes.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (8 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -130 +130 @@
 //#define VERR_SUPDRV_VTG_RESERVED                (-3705)
 #define VERR_SUPDRV_VTG_BAD_HDR                 (-3706)
-#define VERR_SUPDRV_VTG_BAD_HDR_PTR             (-3706)
-#define VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW         (-3707)
-#define VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH        (-3708)
-#define VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE    (-3709)
-#define VERR_SUPDRV_VTG_STRTAB_OFF              (-3709)
-#define VERR_SUPDRV_VTG_BAD_STRING              (-1111)
-#define VERR_SUPDRV_VTG_STRING_TOO_LONG         (-1111)
-#define VERR_SUPDRV_VTG_BAD_ATTR                (-1111)
-#define VERR_SUPDRV_VTG_BAD_PROVIDER            (-1111)
-#define VERR_SUPDRV_VTG_BAD_PROBE               (-1111)
-#define VERR_SUPDRV_VTG_BAD_ARGLIST             (-3709)
-#define VERR_SUPDRV_VTG_BAD_PROBE_ENABLED       (-1111)
-#define VERR_SUPDRV_VTG_BAD_PROBE_LOC           (-3709)
-#define VERR_SUPDRV_VTG_ALREADY_REGISTERED      (-1111)
-#define VERR_SUPDRV_VTG_ONLY_ONCE_PER_SESSION   (-1111)
+#define VERR_SUPDRV_VTG_BAD_HDR_PTR             (-3707)
+#define VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW         (-3708)
+#define VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH        (-3709)
+#define VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE    (-3710)
+#define VERR_SUPDRV_VTG_STRTAB_OFF              (-3711)
+#define VERR_SUPDRV_VTG_BAD_STRING              (-3712)
+#define VERR_SUPDRV_VTG_STRING_TOO_LONG         (-3713)
+#define VERR_SUPDRV_VTG_BAD_ATTR                (-3714)
+#define VERR_SUPDRV_VTG_BAD_PROVIDER            (-3715)
+#define VERR_SUPDRV_VTG_BAD_PROBE               (-3716)
+#define VERR_SUPDRV_VTG_BAD_ARGLIST             (-3717)
+#define VERR_SUPDRV_VTG_BAD_PROBE_ENABLED       (-3718)
+#define VERR_SUPDRV_VTG_BAD_PROBE_LOC           (-3719)
+#define VERR_SUPDRV_VTG_ALREADY_REGISTERED      (-3720)
+#define VERR_SUPDRV_VTG_ONLY_ONCE_PER_SESSION   (-3721)
 
 
@@ -157 +157 @@
         if (   !RTLocCIsAlNum(ch)
             && ch != ' '
+            && ch != '_'
+            && ch != '-'
             && ch != '('
             && ch != ')'
@@ -163 +165 @@
             && ch != '&'
            )
+        {
+            /*RTAssertMsg2("off=%u '%s'\n",  off, psz);*/
             return VERR_SUPDRV_VTG_BAD_STRING;
+        }
     }
     return VERR_SUPDRV_VTG_STRING_TOO_LONG;
@@ -195 +200 @@
     do { \
         if (   (cb) >= cbVtgObj \
-            || (uintptr_t)(p) - (uintptr_t)pVtgHdr < cbVtgObj - (cb) ) \
+            || (uintptr_t)(p) - (uintptr_t)pVtgHdr > cbVtgObj - (cb) ) \
             return rcBase ## _PTR; \
         if ((cb) <  (cMin) * (cbUnit)) \
@@ -235 +240 @@
      * The header.
      */
-    if (!memcmp(pVtgHdr->szMagic, VTGOBJHDR_MAGIC, sizeof(pVtgHdr->szMagic)))
+    if (memcmp(pVtgHdr->szMagic, VTGOBJHDR_MAGIC, sizeof(pVtgHdr->szMagic)))
         return VERR_SUPDRV_VTG_MAGIC;
     if (pVtgHdr->cBits != ARCH_BITS)
@@ -247 +252 @@
     MY_VALIDATE_PTR(pVtgHdr->pachStrTab,        pVtgHdr->cbStrTab,       4,   _1M, sizeof(char),            VERR_SUPDRV_VTG_BAD_HDR);
     MY_VALIDATE_PTR(pVtgHdr->paArgLists,        pVtgHdr->cbArgLists,     1,  _32K, sizeof(uint32_t),        VERR_SUPDRV_VTG_BAD_HDR);
+
     MY_WITHIN_IMAGE(pVtgHdr->paProbLocs,    VERR_SUPDRV_VTG_BAD_HDR_PTR);
     MY_WITHIN_IMAGE(pVtgHdr->paProbLocsEnd, VERR_SUPDRV_VTG_BAD_HDR_PTR);
@@ -252 +258 @@
         return VERR_SUPDRV_VTG_BAD_HDR_PTR;
     cbTmp = (uintptr_t)pVtgHdr->paProbLocsEnd - (uintptr_t)pVtgHdr->paProbLocs;
-    MY_VALIDATE_PTR(pVtgHdr->paProbLocs,        cbTmp,                   1, _128K, sizeof(VTGPROBELOC),     VERR_SUPDRV_VTG_BAD_HDR);
     if (cbTmp < sizeof(VTGPROBELOC))
         return VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW;
+    if (cbTmp >= _128K * sizeof(VTGPROBELOC))
+        return VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH;
+    if (cbTmp / sizeof(VTGPROBELOC) * sizeof(VTGPROBELOC) != cbTmp)
+        return VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE;
 
     if (pVtgHdr->cbProbes / sizeof(VTGDESCPROBE) != pVtgHdr->cbProbeEnabled)
@@ -298 +307 @@
             return VERR_SUPDRV_VTG_BAD_PROBE;
         if (  i - pVtgHdr->paProviders[pVtgHdr->paProbes[i].idxProvider].iFirstProbe
-            < pVtgHdr->paProviders[pVtgHdr->paProbes[i].idxProvider].cProbes)
+            >= pVtgHdr->paProviders[pVtgHdr->paProbes[i].idxProvider].cProbes)
             return VERR_SUPDRV_VTG_BAD_PROBE;
         if (pVtgHdr->paProbes[i].u32User)