StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MTE] unset colliding sanitizers for mutators

Browse Source 
Bug: 174878242
Test: m device-tests with SANITIZE_TARGET=memtag_stack
Change-Id: Ia8659a90c6c1efd9109324e6c46748b434cbfd24
This commit is contained in:
Florian Mayer
2022-09-29 15:48:08 -07:00
parent 7ea3a82480
commit 1bda246235
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/sanitize.go
View File

@@ -881,8 +881,12 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) {
switch t { switch t {
case Asan: case Asan:
sanitize.Properties.Sanitize.Address = bPtr sanitize.Properties.Sanitize.Address = bPtr
// For ASAN variant, we need to disable Memtag_stack
sanitize.Properties.Sanitize.Memtag_stack = nil
case Hwasan: case Hwasan:
sanitize.Properties.Sanitize.Hwaddress = bPtr sanitize.Properties.Sanitize.Hwaddress = bPtr
// For HWAsan variant, we need to disable Memtag_stack
sanitize.Properties.Sanitize.Memtag_stack = nil
case tsan: case tsan:
sanitize.Properties.Sanitize.Thread = bPtr sanitize.Properties.Sanitize.Thread = bPtr
case intOverflow: case intOverflow:
@@ -895,6 +899,7 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) {
sanitize.Properties.Sanitize.Memtag_heap = bPtr sanitize.Properties.Sanitize.Memtag_heap = bPtr
case Memtag_stack: case Memtag_stack:
sanitize.Properties.Sanitize.Memtag_stack = bPtr 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: case Fuzzer:
sanitize.Properties.Sanitize.Fuzzer = bPtr sanitize.Properties.Sanitize.Fuzzer = bPtr
default: default: