Changeset 39091 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Oct 24, 2011 1:58:22 PM (13 years ago)

Author:

vboxsync

Message:

More parameter warning fixes; made PciIch9 check the saved state version.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLibSem.cpp (modified) (2 diffs)
• SUPR3HardenedIPRT.cpp (modified) (1 diff)
• SUPR3HardenedVerify.cpp (modified) (5 diffs)
• linux/SUPLib-linux.cpp (modified) (2 diffs)
• testcase/SUPInstall.cpp (modified) (3 diffs)
• testcase/SUPUninstall.cpp (modified) (3 diffs)

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

@@ -52 +52 @@
 DECLINLINE(int) supSemOp2(PSUPDRVSESSION pSession, uint32_t uType, uintptr_t hSem, uint32_t uOp, uint64_t u64Arg)
 {
+    NOREF(pSession);
     SUPSEMOP2 Req;
     Req.Hdr.u32Cookie           = g_u32Cookie;
@@ -86 +87 @@
 DECLINLINE(int) supSemOp3(PSUPDRVSESSION pSession, uint32_t uType, uintptr_t hSem, uint32_t uOp, PSUPSEMOP3 pReq)
 {
+    NOREF(pSession);
     pReq->Hdr.u32Cookie           = g_u32Cookie;
     pReq->Hdr.u32SessionCookie    = g_u32SessionCookie;

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

@@ -101 +101 @@
     AssertFatalMsgFailed(("%s (rc=%Rrc): %N", pszWhere, rc, pszMsgFmt, &vaCopy));
     va_end(vaCopy);
+    NOREF(enmWhat);
 }
 

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

@@ -814 +814 @@
 }
 
+#ifdef SOME_UNUSED_FUNCTION
 
 /**
@@ -844 +845 @@
 }
 
+#endif /* SOME_UNUSED_FUNCTION */
 
 /**
@@ -1188 +1190 @@
            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 (!fRelaxed || pFsObjState->Stat.st_gid != 80 /*admin*/) /** @todo dynamically resolve the admin group? */
+        bool fBad = !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,
@@ -1197 +1200 @@
          *        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*/)
+        bool fBad = pFsObjState->Stat.st_gid != 5 /*operator*/;
+        NOREF(fRelaxed);
+#else
+        NOREF(fRelaxed);
+        bool fBad = true;
 #endif
+        if (fBad)
             return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo,
                                           "The group is not a system group and it has write access to '", pszPath, "'");
@@ -1217 +1225 @@
     return VINF_SUCCESS;
 #endif
-
 }
 

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

@@ -173 +173 @@
 {
     AssertMsg(pThis->hDevice != (intptr_t)NIL_RTFILE, ("SUPLIB not initiated successfully!\n"));
+    NOREF(cbReq);
 
     /*
@@ -245 +246 @@
 int suplibOsPageFree(PSUPLIBDATA pThis, void *pvPages, size_t cPages)
 {
+    NOREF(pThis);
     munmap(pvPages, cPages << PAGE_SHIFT);
     return VINF_SUCCESS;

trunk/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 #include <VBox/err.h>
 #include <iprt/initterm.h>
-#include <iprt/stream.h>
+#include <iprt/message.h>
 
 
@@ -38 +38 @@
 {
     RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments");
+    NOREF(argv);
+
     int rc = SUPR3Install();
     if (RT_SUCCESS(rc))
     {
-        RTPrintf("installed successfully\n");
-        return 0;
+        RTMsgInfo("installed successfully");
+        return RTEXITCODE_SUCCESS;
     }
-    RTPrintf("installation failed. rc=%Rrc\n", rc);
-    return 1;
+    return RTMsgErrorExit(RTEXITCODE_FAILURE, "installation failed. rc=%Rrc", rc);
 }
 

trunk/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
+#include <iprt/message.h>
 
 
@@ -38 +39 @@
 {
     RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     int rc = SUPR3Uninstall();
     if (RT_SUCCESS(rc))
     {
-        RTPrintf("uninstalled successfully\n");
-        return 0;
+        RTMsgInfo("uninstalled successfully");
+        return RTEXITCODE_SUCCESS;
     }
-    RTPrintf("uninstallation failed. rc=%Rrc\n", rc);
-    return 1;
+    return RTMsgErrorExit(RTEXITCODE_FAILURE, "uninstallation failed. rc=%Rrc", rc);
 }