Changeset 93325 in vbox for trunk

Timestamp:

Jan 18, 2022 4:00:55 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,SUPDrv-win.cpp: Hardened ASAN build adjustments. bugref:8492 bugref:9841

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -6373 +6373 @@
  TEMPLATE_VBOXR3HARDENEDEXE_SDKS.x86      = VBOX_WIN_INT64
  ifneq ($(VBOX_VCC_LD_GUARD_CF),)
-  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS       = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_CXXFLAGS))
-  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) #-O2 -Oy-
-  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS       = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_PCHFLAGS))
-  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_PCHFLAGS.debug)) #-O2 -Oy-
-  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS         = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_CFLAGS))
-  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.debug   = $(filter-out -RTC% -GZ,$(TEMPLATE_VBOXR3EXE_CFLAGS.debug)) -O2 -Oy-
+  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_CXXFLAGS))
+  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) #-O2 -Oy-
+  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_PCHFLAGS))
+  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_PCHFLAGS.debug)) #-O2 -Oy-
+  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS         = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_CFLAGS))
+  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.debug   = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBOXR3EXE_CFLAGS.debug)) -O2 -Oy-
  else
-  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS       = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -GS-
-  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) -GS- #-O2 -Oy-
-  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS       = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_PCHFLAGS)) -GS-
-  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_PCHFLAGS.debug)) -GS- #-O2 -Oy-
-  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS         = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS)) -GS-
-  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.debug   = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS.debug)) -GS- -O2 -Oy-
- endif
- TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(TEMPLATE_VBOXR3EXE_LDFLAGS) \
+  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -GS-
+  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) -GS- #-O2 -Oy-
+  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_PCHFLAGS)) -GS-
+  TEMPLATE_VBOXR3HARDENEDEXE_PCHFLAGS.debug = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_PCHFLAGS.debug)) -GS- #-O2 -Oy-
+  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS         = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS)) -GS-
+  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.debug   = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS) -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS.debug)) -GS- -O2 -Oy-
+ endif
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out  $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
         /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE).lib \
         /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE).lib \

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

@@ -5514 +5514 @@
                         /* .Version                     = */ OB_FLT_REGISTRATION_VERSION,
                         /* .OperationRegistrationCount  = */ RT_ELEMENTS(s_aObOperations),
-                        /* .Altitude.Length             = */ 0,
-                        /* .Altitude.MaximumLength      = */ 0,
-                        /* .Altitude.Buffer             = */ NULL,
+                        /* .Altitude.Length             = */ { 0,
+                        /* .Altitude.MaximumLength      = */   0,
+                        /* .Altitude.Buffer             = */   NULL },
                         /* .RegistrationContext         = */ NULL,
                         /* .OperationRegistration       = */ &s_aObOperations[0]