Changeset 21090 in vbox for trunk

Timestamp:

Jun 30, 2009 5:49:55 PM (16 years ago)

Author:

vboxsync

Message:

Main/xpcom/server: Launch only kernel arch matching VBoxSVC for Solaris hardened builds.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• xpcom/server_module.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -486 +486 @@
 VBoxSVCM_TEMPLATE       = VBOXMAINCOMP
 VBoxSVCM_DEFS           = IN_RING3 $(VBOX_MAIN_DEFS)
+ifdef VBOX_WITH_HARDENING
+ VBoxSVCM_DEFS         += VBOX_WITH_HARDENING
+endif
 VBoxSVCM_INCS           = \
         include \

trunk/src/VBox/Main/xpcom/server_module.cpp

@@ -58 +58 @@
 #include <string.h>
 
+#if defined(RT_OS_SOLARIS)
+# include <sys/systeminfo.h>
+#endif
 
 /// @todo move this to RT headers (and use them in MachineImpl.cpp as well)
@@ -138 +141 @@
                                      rc = NS_ERROR_FAILURE);
 
+#if defined(RT_OS_SOLARIS) && defined(VBOX_WITH_HARDENING)
+                    char achKernArch[128];
+                    int cbKernArch = sysinfo (SI_ARCHITECTURE_K, achKernArch, sizeof(achKernArch));
+                    if (cbKernArch > 0)
+                    {
+                        sprintf(VBoxSVCPath, "/opt/VirtualBox/%s/%s", achKernArch, VBoxSVC_exe);
+                        IsVBoxSVCPathSet = true;
+                    }
+                    else
+                        rc = NS_ERROR_UNEXPECTED;
+#else
                     strcpy (VBoxSVCPath, path.get());
                     RTPathStripFilename (VBoxSVCPath);
@@ -143 +157 @@
 
                     IsVBoxSVCPathSet = true;
+#endif
                 }
             }