p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable integer_overflow flag for static targets. 

This allows the integer_overflow LOCAL_SANITIZE setting to be used with
static targets, to mirror Soong.

Bug: 73283972
Test: make SANITIZE_TARGET{,_DIAG}=integer_overflow
Test: Enabled sanitizer in a static target and tested for SIGABRT.
Change-Id: I0103dc3485b63b86a3dd36a7277b5001813b37fd
This commit is contained in:
Ivan Lozano 2018-03-15 14:49:20 -07:00
parent d04f28db7b
commit 702e8bdaba
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/config_sanitizers.mk
View File

@ -34,6 +34,16 @@ ifneq ($(filter integer_overflow, $(my_global_sanitize)),)
endif endif
endif endif
# Global integer sanitization doesn't support static modules.
ifeq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),)
my_global_sanitize := $(filter-out integer_overflow,$(my_global_sanitize))
my_global_sanitize_diag := $(filter-out integer_overflow,$(my_global_sanitize_diag))
endif
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_global_sanitize := $(filter-out integer_overflow,$(my_global_sanitize))
my_global_sanitize_diag := $(filter-out integer_overflow,$(my_global_sanitize_diag))
endif
# Disable global CFI in excluded paths # Disable global CFI in excluded paths
ifneq ($(filter cfi, $(my_global_sanitize)),) ifneq ($(filter cfi, $(my_global_sanitize)),)
combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \ combined_exclude_paths := $(CFI_EXCLUDE_PATHS) \
@ -132,10 +142,12 @@ ifneq ($(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag)) my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
endif endif
# Disable CFI for host targets # Disable sanitizers which need the UBSan runtime for host targets.
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
my_sanitize := $(filter-out cfi,$(my_sanitize)) my_sanitize := $(filter-out cfi,$(my_sanitize))
my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag)) my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))
my_sanitize := $(filter-out signed-integer-overflow unsigned-integer-overflow integer_overflow,$(my_sanitize))
my_sanitize_diag := $(filter-out signed-integer-overflow unsigned-integer-overflow integer_overflow,$(my_sanitize_diag))
endif endif
# Support for local sanitize blacklist paths. # Support for local sanitize blacklist paths.
@ -212,23 +224,26 @@ ifneq ($(filter coverage,$(my_sanitize)),)
endif endif
ifneq ($(filter integer_overflow,$(my_sanitize)),) ifneq ($(filter integer_overflow,$(my_sanitize)),)
ifneq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),) # Respect LOCAL_NOSANITIZE for integer-overflow flags.
ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) ifeq ($(filter signed-integer-overflow, $(strip $(LOCAL_NOSANITIZE))),)
my_sanitize += signed-integer-overflow
endif
ifeq ($(filter unsigned-integer-overflow, $(strip $(LOCAL_NOSANITIZE))),)
my_sanitize += unsigned-integer-overflow
endif
my_cflags += $(INTEGER_OVERFLOW_EXTRA_CFLAGS)
# Respect LOCAL_NOSANITIZE for integer-overflow flags. # Check for diagnostics mode.
ifeq ($(filter signed-integer-overflow, $(strip $(LOCAL_NOSANITIZE))),) ifneq ($(filter integer_overflow,$(my_sanitize_diag)),)
my_sanitize += signed-integer-overflow ifneq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),)
endif ifneq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
ifeq ($(filter unsigned-integer-overflow, $(strip $(LOCAL_NOSANITIZE))),)
my_sanitize += unsigned-integer-overflow
endif
my_cflags += $(INTEGER_OVERFLOW_EXTRA_CFLAGS)
# Check for diagnostics mode (on by default).
ifneq ($(filter integer_overflow,$(my_sanitize_diag)),)
my_sanitize_diag += signed-integer-overflow my_sanitize_diag += signed-integer-overflow
my_sanitize_diag += unsigned-integer-overflow my_sanitize_diag += unsigned-integer-overflow
else
$(call pretty-error,Make cannot apply integer overflow diagnostics to static binary.)
endif endif
else
$(call pretty-error,Make cannot apply integer overflow diagnostics to static library.)
endif endif
endif endif
my_sanitize := $(filter-out integer_overflow,$(my_sanitize)) my_sanitize := $(filter-out integer_overflow,$(my_sanitize))