From 66b5e3ca1941a118bbb8ea41bfe98f9725ee8d5d Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Tue, 6 Aug 2019 19:23:45 -0700 Subject: fdsan: make fatal by default. Make fdsan fatal by default on native processes, and Java processes that target R or later. Bug: http://b/137788030 Test: manual Change-Id: I5900efc606fc0d47b69223574ad7dca89afe4eda --- linker/linker_sdk_versions.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'linker/linker_sdk_versions.cpp') diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp index b06f3e63f..29c0f4af2 100644 --- a/linker/linker_sdk_versions.cpp +++ b/linker/linker_sdk_versions.cpp @@ -26,10 +26,13 @@ * SUCH DAMAGE. */ -#include "linker.h" -#include #include +#include +#include + +#include "linker.h" + static std::atomic g_target_sdk_version(__ANDROID_API__); void set_application_target_sdk_version(int target) { @@ -38,6 +41,10 @@ void set_application_target_sdk_version(int target) { target = __ANDROID_API__; } g_target_sdk_version = target; + + if (target < 30) { + android_fdsan_set_error_level_from_property(ANDROID_FDSAN_ERROR_LEVEL_WARN_ONCE); + } } int get_application_target_sdk_version() { -- cgit v1.2.3 From 76351e3e3fbbd386c059251dbc6b1081a8f77088 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Fri, 9 Aug 2019 11:15:40 +0000 Subject: Revert "fdsan: make fatal by default." This reverts commit 66b5e3ca1941a118bbb8ea41bfe98f9725ee8d5d. Reason for revert: Causes installd_dexopt_test to fail. Presumably there is an existing issue which this change is turning into a hard fail, so that needs to be fixed before this can be rolled forwards. See b/139092341. Bug: 139092341 Bug: 137788030 Change-Id: I1beccddff64c86541bc003b9b009f4046ec9cbf1 --- linker/linker_sdk_versions.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'linker/linker_sdk_versions.cpp') diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp index 29c0f4af2..b06f3e63f 100644 --- a/linker/linker_sdk_versions.cpp +++ b/linker/linker_sdk_versions.cpp @@ -26,12 +26,9 @@ * SUCH DAMAGE. */ -#include - -#include -#include - #include "linker.h" +#include +#include static std::atomic g_target_sdk_version(__ANDROID_API__); @@ -41,10 +38,6 @@ void set_application_target_sdk_version(int target) { target = __ANDROID_API__; } g_target_sdk_version = target; - - if (target < 30) { - android_fdsan_set_error_level_from_property(ANDROID_FDSAN_ERROR_LEVEL_WARN_ONCE); - } } int get_application_target_sdk_version() { -- cgit v1.2.3 From 6a5101372865eab449c876a0ff4933185ed263a2 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Tue, 20 Aug 2019 17:59:14 -0700 Subject: Reland "fdsan: make fatal by default." The two tests known to be failing (installd_dexopt_test and BpfMapTest) have been fixed, so let's try this again. This reverts commit 76351e3e3fbbd386c059251dbc6b1081a8f77088. Bug: http://b/137788030 Bug: http://b/139092341 Bug: http://b/139175951 Test: treehugger --- linker/linker_sdk_versions.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'linker/linker_sdk_versions.cpp') diff --git a/linker/linker_sdk_versions.cpp b/linker/linker_sdk_versions.cpp index b06f3e63f..29c0f4af2 100644 --- a/linker/linker_sdk_versions.cpp +++ b/linker/linker_sdk_versions.cpp @@ -26,10 +26,13 @@ * SUCH DAMAGE. */ -#include "linker.h" -#include #include +#include +#include + +#include "linker.h" + static std::atomic g_target_sdk_version(__ANDROID_API__); void set_application_target_sdk_version(int target) { @@ -38,6 +41,10 @@ void set_application_target_sdk_version(int target) { target = __ANDROID_API__; } g_target_sdk_version = target; + + if (target < 30) { + android_fdsan_set_error_level_from_property(ANDROID_FDSAN_ERROR_LEVEL_WARN_ONCE); + } } int get_application_target_sdk_version() { -- cgit v1.2.3