Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d406f85 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enable HWASan for multiple modules in one place(Make)"

parents 56f81f3d e235ded7

core/config_sanitizers.mk

+11 −0
Original line number Diff line number Diff line
@@ -155,6 +155,17 @@ ifeq ($(filter memtag_heap, $(my_sanitize)),) 
  endif

endif



# Enable HWASan in included paths.

ifeq ($(filter hwaddress, $(my_sanitize)),)

  combined_include_paths := $(HWASAN_INCLUDE_PATHS) \

                            $(PRODUCT_HWASAN_INCLUDE_PATHS)



  ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\

         $(filter $(dir)%,$(LOCAL_PATH)))),)

    my_sanitize := hwaddress $(my_sanitize)

  endif

endif



# If CFI is disabled globally, remove it from my_sanitize.

ifeq ($(strip $(ENABLE_CFI)),false)

  my_sanitize := $(filter-out cfi,$(my_sanitize))

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ _product_list_vars += PRODUCT_CFI_INCLUDE_PATHS 
# Whether any paths are excluded from sanitization when SANITIZE_TARGET=cfi

_product_list_vars += PRODUCT_CFI_EXCLUDE_PATHS



# Whether any paths should have HWASan enabled for components

_product_list_vars += PRODUCT_HWASAN_INCLUDE_PATHS



# Whether the Scudo hardened allocator is disabled platform-wide

_product_single_value_vars += PRODUCT_DISABLE_SCUDO

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ $(call add_json_bool, EnableCFI, $(call invert_bool,$(fi 
$(call add_json_list, CFIExcludePaths,                   $(CFI_EXCLUDE_PATHS) $(PRODUCT_CFI_EXCLUDE_PATHS))

$(call add_json_list, CFIIncludePaths,                   $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))

$(call add_json_list, IntegerOverflowExcludePaths,       $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))

$(call add_json_list, HWASanIncludePaths,                $(HWASAN_INCLUDE_PATHS) $(PRODUCT_HWASAN_INCLUDE_PATHS))



$(call add_json_list, MemtagHeapExcludePaths,            $(MEMTAG_HEAP_EXCLUDE_PATHS) $(PRODUCT_MEMTAG_HEAP_EXCLUDE_PATHS))

$(call add_json_list, MemtagHeapAsyncIncludePaths,       $(MEMTAG_HEAP_ASYNC_INCLUDE_PATHS) $(PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS))