commit c5ef21febf672f9ef99a2accc2217afa89e91d37
author Ivan Lozano <ivanlozano@google.com> Sat Jan 20 01:44:11 2018 +0000
committer Ivan Lozano <ivanlozano@google.com> Sat Jan 20 01:44:11 2018 +0000
tree af660c29b8856f9e05b202a312653b50884484cf
parent c2d7db1c7d650ec6b1ca006812404c8fd4bcf01e

Revert "Overflow sanitization in frameworks/ and system/."

This reverts commit c2d7db1c7d650ec6b1ca006812404c8fd4bcf01e.

Change-Id: I3bab6a359bcec605a8120bf106bf121090eb63fe

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 2064d8d..9415143 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -34,26 +34,6 @@
   endif
 endif
 
-# Enable integer overflow sanitizer in included paths.
-# (includes override excludes)
-ifeq ($(my_clang),true)
-  ifndef LOCAL_IS_HOST_MODULE
-    ifeq ($(filter integer_overflow, $(my_sanitize)),)
-      combined_include_paths := $(DEFAULT_INTEGER_OVERFLOW_PATHS) \
-                            $(INTEGER_OVERFLOW_INCLUDE_PATHS) \
-                            $(PRODUCT_INTEGER_OVERFLOW_INCLUDE_PATHS)
-      ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
-             $(filter $(dir)%,$(LOCAL_PATH)))),)
-        my_global_sanitize := integer_overflow $(my_sanitize)
-        # Ensure default paths do not run in diagnostics unless SANITIZE_TARGET_DIAG
-        ifneq ($(filter integer_overflow, $(SANITIZE_TARGET_DIAG)),)
-          my_global_sanitize_diag := integer_overflow $(my_sanitize_diag)
-        endif
-      endif
-    endif
-  endif
-endif
-
 # Disable global CFI in excluded paths
 ifneq ($(filter cfi, $(my_global_sanitize)),)
   combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \
@@ -231,19 +211,6 @@
   my_sanitize := $(filter-out coverage,$(my_sanitize))
 endif
 
-# Use minimal diagnostics when integer overflow is enabled on userdebug and eng
-# and full diagnostics not enabled.
-ifneq ($(findstring integer,$(my_sanitize)),)
-  ifeq ($(findstring integer,$(my_sanitize_diag)),)
-    ifeq ($(filter address,$(my_sanitize)),)
-      # TODO(ivanlozano): uncomment after switch to clang-4536805
-      ifneq ($(filter $(TARGET_BUILD_VARIANT),userdebug eng),)
-        # my_cflags += -fsanitize-minimal-runtime
-      endif
-    endif
-  endif
-endif
-
 ifneq ($(filter integer_overflow,$(my_sanitize)),)
   ifneq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),)
     ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
@@ -259,7 +226,7 @@
       my_cflags += -ftrap-function=abort
       my_cflags += $(INTEGER_OVERFLOW_EXTRA_CFLAGS)
 
-      # Check for diagnostics mode.
+      # Check for diagnostics mode (on by default).
       ifneq ($(filter integer_overflow,$(my_sanitize_diag)),)
         my_cflags += -fno-sanitize-trap=signed-integer-overflow,unsigned-integer-overflow
         my_shared_libraries := $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_RUNTIME_LIBRARY) $(my_shared_libraries)