Changeset 39086 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 24, 2011 9:39:47 AM (13 years ago)

Author:

vboxsync

Message:

Dis,SrvPciRaw,Sup: warning fixes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (9 diffs)
• SUPR3HardenedVerify.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -580 +580 @@
 static int supCallVMMR0ExFake(PVMR0 pVMR0, unsigned uOperation, uint64_t u64Arg, PSUPVMMR0REQHDR pReqHdr)
 {
-    AssertMsgFailed(("%d\n", uOperation));
+    AssertMsgFailed(("%d\n", uOperation)); NOREF(pVMR0); NOREF(uOperation); NOREF(u64Arg); NOREF(pReqHdr);
     return VERR_NOT_SUPPORTED;
 }
@@ -587 +587 @@
 SUPR3DECL(int) SUPR3CallVMMR0Fast(PVMR0 pVMR0, unsigned uOperation, VMCPUID idCpu)
 {
+    NOREF(pVMR0);
     if (RT_LIKELY(uOperation == SUP_VMMR0_DO_RAW_RUN))
         return suplibOsIOCtlFast(&g_supLibData, SUP_IOCTL_FAST_DO_RAW_RUN, idCpu);
@@ -1040 +1041 @@
     AssertPtrNullReturn(paPages, VERR_INVALID_POINTER);
     AssertMsgReturn(cPages > 0 && cPages <= VBOX_MAX_ALLOC_PAGE_COUNT, ("cPages=%zu\n", cPages), VERR_PAGE_COUNT_OUT_OF_RANGE);
+    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
     /* fake */
@@ -1538 +1540 @@
     return rc;
 #else
+    NOREF(pszDirPath); NOREF(fRecursive); NOREF(fCheckFiles);
     return VINF_SUCCESS;
 #endif
@@ -1615 +1618 @@
                                                     const char *pszSymbol, unsigned uSymbol, RTUINTPTR *pValue, void *pvUser)
 {
+    NOREF(hLdrMod); NOREF(pvUser); NOREF(uSymbol);
     AssertPtr(pValue);
     AssertPtr(pvUser);
@@ -1754 +1758 @@
         pArgs->cbStrings += strlen(pszSymbol) + 1;
     }
+    NOREF(hLdrMod); NOREF(uSymbol);
     return VINF_SUCCESS;
 }
@@ -1786 +1791 @@
         pArgs->psz += cbCopy;
     }
+    NOREF(hLdrMod); NOREF(uSymbol);
     return VINF_SUCCESS;
 }
@@ -2232 +2238 @@
 SUPR3DECL(int) SUPR3HardenedLdrLoadPlugIn(const char *pszFilename, PRTLDRMOD phLdrMod, PRTERRINFO pErrInfo)
 {
-    int rc;
-
     /*
      * Validate input.
@@ -2247 +2251 @@
      * Verify the image file.
      */
-    rc = supR3HardenedVerifyFile(pszFilename, RTHCUINTPTR_MAX, pErrInfo);
+    int rc = supR3HardenedVerifyFile(pszFilename, RTHCUINTPTR_MAX, pErrInfo);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -278 +278 @@
      */
     int rc = supR3HardenedMakePath(pFile->enmDir, pszDst, cchDst, fFatal);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && fWithFilename)
     {
         size_t cchFile = strlen(pFile->pszFile);
@@ -456 +456 @@
     {
         char szPath[RTPATH_MAX];
-        rc = supR3HardenedMakeFilePath(pFile, szPath, sizeof(szPath), true, fFatal);
+        rc = supR3HardenedMakeFilePath(pFile, szPath, sizeof(szPath), true /*fWithFilename*/, fFatal);
         if (RT_SUCCESS(rc))
         {
@@ -1135 +1135 @@
 #if defined(RT_OS_WINDOWS)
     /** @todo Windows hardening. */
+    NOREF(pFsObjState); NOREF(fDir); NOREF(fRelaxed); NOREF(pszPath); NOREF(pErrInfo);
     return VINF_SUCCESS;
 
 #elif defined(RT_OS_OS2)
     /* No hardening here - it's a single user system. */
+    NOREF(pFsObjState); NOREF(fDir); NOREF(fRelaxed); NOREF(pszPath); NOREF(pErrInfo);
     return VINF_SUCCESS;
 
@@ -1186 +1188 @@
            full access. So, to work around we relax the hardening a bit and
            permit grand parents and beyond to be group writable by admin. */
-        if (pFsObjState->Stat.st_gid != 80 /*admin*/) /** @todo dynamically resolve the admin group? */
+        if (!fRelaxed || pFsObjState->Stat.st_gid != 80 /*admin*/) /** @todo dynamically resolve the admin group? */
 #elif defined(RT_OS_FREEBSD)
         /* HACK ALERT: PC-BSD 9 has group-writable application directory,
-           similar to OS X and their /Applications directory (see above). */
-        if (pFsObjState->Stat.st_gid != 5 /*operators*/)
+           similar to OS X and their /Applications directory (see above).
+           On FreeBSD root is normally the only member of this group. */
+        /** @todo Can we test for fRelaxed here like on the mac or is the 'operator'
+         *        group the owner of the immediate installation directory? More
+         *        details would be greatly appreciated as this HACK affects real FreeBSD
+         *        as well as the PC-BSD fork! */
+        if (pFsObjState->Stat.st_gid != 5 /*operator*/)
 #endif
             return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo,