Allow integer_overflow sanitizer path exclusion.
Add support for excluding paths from having integer_overflow applied to
them when using SANITIZE_TARGET=integer_overflow via an
INTEGER_OVERFLOW_EXCLUDE_PATHS make variable. This covers the soong side
of the change.
Bug: 30969751
Test: Build with SANITIZE_TARGET=integer_overflow
SANITIZE_TARGET_DIAG=integer_overflow
INTEGER_OVERFLOW_EXCLUDE_PATHS=<path> and confirmed this was no
longer being applied to binaries in that path.
Change-Id: I298b772f5425da28dff1cf007825be19558db3a8
diff --git a/android/config.go b/android/config.go
index 661e333..5dcc59b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -530,20 +530,21 @@
func (c *deviceConfig) CoverageEnabledForPath(path string) bool {
coverage := false
if c.config.ProductVariables.CoveragePaths != nil {
- for _, prefix := range *c.config.ProductVariables.CoveragePaths {
- if strings.HasPrefix(path, prefix) {
- coverage = true
- break
- }
+ if prefixInList(path, *c.config.ProductVariables.CoveragePaths) {
+ coverage = true
}
}
if coverage && c.config.ProductVariables.CoverageExcludePaths != nil {
- for _, prefix := range *c.config.ProductVariables.CoverageExcludePaths {
- if strings.HasPrefix(path, prefix) {
- coverage = false
- break
- }
+ if prefixInList(path, *c.config.ProductVariables.CoverageExcludePaths) {
+ coverage = false
}
}
return coverage
}
+
+func (c *config) IntegerOverflowDisabledForPath(path string) bool {
+ if c.ProductVariables.IntegerOverflowExcludePaths == nil {
+ return false
+ }
+ return prefixInList(path, *c.ProductVariables.IntegerOverflowExcludePaths)
+}
diff --git a/android/util.go b/android/util.go
index 8cee256..80c7870 100644
--- a/android/util.go
+++ b/android/util.go
@@ -68,6 +68,15 @@
return indexList(s, list) != -1
}
+func prefixInList(s string, list []string) bool {
+ for _, prefix := range list {
+ if strings.HasPrefix(s, prefix) {
+ return true
+ }
+ }
+ return false
+}
+
// checkCalledFromInit panics if a Go package's init function is not on the
// call stack.
func checkCalledFromInit() {
diff --git a/android/variable.go b/android/variable.go
index 7ca7a55..8462d0d 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -140,6 +140,8 @@
Treble *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"`
+ IntegerOverflowExcludePaths *[]string `json:",omitempty"`
+
VendorPath *string `json:",omitempty"`
ClangTidy *bool `json:",omitempty"`
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 49bd0f3..eccd255 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -188,7 +188,9 @@
}
if found, globalSanitizers = removeFromList("integer_overflow", globalSanitizers); found && s.Integer_overflow == nil {
- s.Integer_overflow = boolPtr(true)
+ if !ctx.AConfig().IntegerOverflowDisabledForPath(ctx.ModuleDir()) {
+ s.Integer_overflow = boolPtr(true)
+ }
}
if len(globalSanitizers) > 0 {