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

Commit 1bda2462 authored by Florian Mayer's avatar Florian Mayer
Browse files

[MTE] unset colliding sanitizers for mutators 

Bug: 174878242
Test: m device-tests with SANITIZE_TARGET=memtag_stack
Change-Id: Ia8659a90c6c1efd9109324e6c46748b434cbfd24
parent 7ea3a824

cc/sanitize.go

+5 −0
Original line number Diff line number Diff line
@@ -881,8 +881,12 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) { 
	switch t {

	case Asan:

		sanitize.Properties.Sanitize.Address = bPtr

		// For ASAN variant, we need to disable Memtag_stack

		sanitize.Properties.Sanitize.Memtag_stack = nil

	case Hwasan:

		sanitize.Properties.Sanitize.Hwaddress = bPtr

		// For HWAsan variant, we need to disable Memtag_stack

		sanitize.Properties.Sanitize.Memtag_stack = nil

	case tsan:

		sanitize.Properties.Sanitize.Thread = bPtr

	case intOverflow:
@@ -895,6 +899,7 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) { 
		sanitize.Properties.Sanitize.Memtag_heap = bPtr

	case Memtag_stack:

		sanitize.Properties.Sanitize.Memtag_stack = bPtr

		// We do not need to disable ASAN or HWASan here, as there is no Memtag_stack variant.

	case Fuzzer:

		sanitize.Properties.Sanitize.Fuzzer = bPtr

	default: