Changeset 84396 in vbox

Timestamp:

May 20, 2020 9:31:44 AM (5 years ago)

Author:

vboxsync

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

138092

Message:

*.kmk: Hardening related DEFS string quoting. bugref:8489

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/testcase/Makefile.kmk (modified) (1 diff)
• NetworkServices/NAT/Makefile.kmk (modified) (1 diff)
• Runtime/testcase/Makefile.kmk (modified) (6 diffs)
• VMM/testcase/Makefile.kmk (modified) (9 diffs)

trunk/src/VBox/HostDrivers/Support/testcase/Makefile.kmk

@@ -109 +109 @@
 
 tstGIP-2Hardened_TEMPLATE = VBoxR3HardenedTstExe
-tstGIP-2Hardened_DEFS = PROGRAM_NAME_STR=\"tstGIP-2\"
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ tstGIP-2Hardened_DEFS = PROGRAM_NAME_STR="tstGIP-2"
+else
+ tstGIP-2Hardened_DEFS = PROGRAM_NAME_STR=\"tstGIP-2\"
+endif
 tstGIP-2Hardened_SOURCES = ../SUPR3HardenedMainTemplateTestcase.cpp
 tstGIP-2Hardened_NAME = tstGIP-2

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -37 +37 @@
 VBoxNetNATHardened_TEMPLATE = VBOXR3HARDENEDEXE
 VBoxNetNATHardened_NAME     = VBoxNetNAT
+  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+VBoxNetNATHardened_DEFS     = SERVICE_NAME="VBoxNetNAT"
+  else
 VBoxNetNATHardened_DEFS     = SERVICE_NAME=\"VBoxNetNAT\"
+  endif
 VBoxNetNATHardened_SOURCES  = VBoxNetNATHardened.cpp
 VBoxNetNATHardened_LDFLAGS.win = /SUBSYSTEM:windows

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -773 +773 @@
  tstRTR0DbgKrnlInfoDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0DbgKrnlInfoDriverHardened_NAME = tstRTR0DbgKrnlInfoDriver
- tstRTR0DbgKrnlInfoDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0DbgKrnlInfoDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0DbgKrnlInfoDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0DbgKrnlInfoDriver"
+ else
+  tstRTR0DbgKrnlInfoDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0DbgKrnlInfoDriver\"
+ endif
  tstRTR0DbgKrnlInfoDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0DbgKrnlInfoDriver_TEMPLATE = VBoxR3HardenedTstDll
@@ -795 +799 @@
  tstRTR0MemUserKernelDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0MemUserKernelDriverHardened_NAME = tstRTR0MemUserKernelDriver
- tstRTR0MemUserKernelDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0MemUserKernelDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0MemUserKernelDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0MemUserKernelDriver"
+ else
+  tstRTR0MemUserKernelDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0MemUserKernelDriver\"
+ endif
  tstRTR0MemUserKernelDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0MemUserKernelDriver_TEMPLATE = VBoxR3HardenedTstDll
@@ -816 +824 @@
  tstRTR0SemMutexDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0SemMutexDriverHardened_NAME = tstRTR0SemMutexDriver
- tstRTR0SemMutexDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0SemMutexDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0SemMutexDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0SemMutexDriver"
+ else
+  tstRTR0SemMutexDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0SemMutexDriver\"
+ endif
  tstRTR0SemMutexDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0SemMutexDriver_TEMPLATE = VBoxR3HardenedTstDll
@@ -837 +849 @@
  tstRTR0ThreadDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0ThreadDriverHardened_NAME = tstRTR0ThreadDriver
- tstRTR0ThreadDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0ThreadDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0ThreadDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0ThreadDriver"
+ else
+  tstRTR0ThreadDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0ThreadDriver\"
+ endif
  tstRTR0ThreadDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0ThreadDriver_TEMPLATE = VBoxR3HardenedTstDll
@@ -858 +874 @@
  tstRTR0TimerDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0TimerDriverHardened_NAME = tstRTR0TimerDriver
- tstRTR0TimerDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0TimerDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0TimerDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0TimerDriver"
+ else
+  tstRTR0TimerDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0TimerDriver\"
+ endif
  tstRTR0TimerDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0TimerDriver_TEMPLATE = VBoxR3HardenedTstDll
@@ -879 +899 @@
  tstRTR0ThreadPreemptionDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
  tstRTR0ThreadPreemptionDriverHardened_NAME = tstRTR0ThreadPreemptionDriver
- tstRTR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0ThreadPreemptionDriver\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  tstRTR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0ThreadPreemptionDriver"
+ else
+  tstRTR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0ThreadPreemptionDriver\"
+ endif
  tstRTR0ThreadPreemptionDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
  tstRTR0ThreadPreemptionDriver_TEMPLATE = VBoxR3HardenedTstDll

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -218 +218 @@
 tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
 tstGlobalConfigHardened_NAME     = tstGlobalConfig
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR="tstGlobalConfig"
+ else
 tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR=\"tstGlobalConfig\"
+ endif
 tstGlobalConfigHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
 tstGlobalConfig_TEMPLATE = VBoxR3HardenedTstDll
@@ -246 +250 @@
 tstMMHyperHeapHardened_TEMPLATE = VBoxR3HardenedTstExe
 tstMMHyperHeapHardened_NAME     = tstMMHyperHeap
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR="tstMMHyperHeap"
+ else
 tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR=\"tstMMHyperHeap\"
+ endif
 tstMMHyperHeapHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
 tstMMHyperHeap_TEMPLATE = VBoxR3HardenedTstDll
@@ -271 +279 @@
 tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
 tstCFGMHardened_NAME     = tstCFGM
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstCFGMHardened_DEFS     = PROGRAM_NAME_STR="tstCFGM"
+ else
 tstCFGMHardened_DEFS     = PROGRAM_NAME_STR=\"tstCFGM\"
+ endif
 tstCFGMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
 tstCFGM_TEMPLATE         = VBoxR3HardenedTstDll
@@ -309 +321 @@
 tstVMREQHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstVMREQHardened_NAME     = tstVMREQ
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstVMREQHardened_DEFS     = PROGRAM_NAME_STR="tstVMREQ"
+ else
 tstVMREQHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMREQ\"
+ endif
 tstVMREQHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstVMREQ_TEMPLATE         = VBOXR3
@@ -325 +341 @@
 tstAnimateHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstAnimateHardened_NAME     = tstAnimate
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstAnimateHardened_DEFS     = PROGRAM_NAME_STR="tstAnimate"
+ else
 tstAnimateHardened_DEFS     = PROGRAM_NAME_STR=\"tstAnimate\"
+ endif
 tstAnimateHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstAnimate_TEMPLATE         = VBOXR3
@@ -352 +372 @@
 tstVMMHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstVMMHardened_NAME     = tstVMM
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstVMMHardened_DEFS     = PROGRAM_NAME_STR="tstVMM"
+ else
 tstVMMHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMM\"
+ endif
 tstVMMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstVMM_TEMPLATE         = VBOXR3
@@ -381 +405 @@
 tstMicroHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstMicroHardened_NAME     = tstMicro
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstMicroHardened_DEFS     = PROGRAM_NAME_STR="tstMicro"
+ else
 tstMicroHardened_DEFS     = PROGRAM_NAME_STR=\"tstMicro\"
+ endif
 tstMicroHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstMicro_TEMPLATE         = VBOXR3
@@ -444 +472 @@
 tstPDMAsyncCompletionHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstPDMAsyncCompletionHardened_NAME     = tstPDMAsyncCompletion
+  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletion"
+  else
 tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletion\"
+  endif
 tstPDMAsyncCompletionHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstPDMAsyncCompletion_TEMPLATE         = VBOXR3
@@ -461 +493 @@
 tstPDMAsyncCompletionStressHardened_TEMPLATE = VBOXR3HARDENEDEXE
 tstPDMAsyncCompletionStressHardened_NAME     = tstPDMAsyncCompletionStress
+  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletionStress"
+  else
 tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletionStress\"
+  endif
 tstPDMAsyncCompletionStressHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
 tstPDMAsyncCompletionStress_TEMPLATE   = VBOXR3