diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-17 23:16:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-17 23:16:02 +0000 |
| commit | e07a7f4e2660f4bebae0b4c47c88a4147f73e8d1 (patch) | |
| tree | 1e3f9b7eef08ee3fae22fe04dc98e7377e7104bd | |
| parent | 4768ed5fd179a68fab6c1d45dd9caf1ca7510e8c (diff) | |
| parent | 5f9b54d06c47d8197bf0ab94ff689bebd9453e79 (diff) | |
| download | cts-e07a7f4e2660f4bebae0b4c47c88a4147f73e8d1.tar.gz | |
Merge "[RESTRICT AUTOMERGE]: Crash Parser ignore CANNOT LINK EXECUTABLE" into oreo-mr1-cts-dev
| -rw-r--r-- | common/util/src/com/android/compatibility/common/util/CrashUtils.java | 2 | ||||
| -rw-r--r-- | common/util/tests/src/com/android/compatibility/common/util/CrashUtilsTest.java | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/common/util/src/com/android/compatibility/common/util/CrashUtils.java b/common/util/src/com/android/compatibility/common/util/CrashUtils.java index 95267061d8b..b7790529ee1 100644 --- a/common/util/src/com/android/compatibility/common/util/CrashUtils.java +++ b/common/util/src/com/android/compatibility/common/util/CrashUtils.java @@ -243,7 +243,7 @@ public class CrashUtils { minCrashAddress = MIN_CRASH_ADDR; setSignals(SIGSEGV, SIGBUS); abortMessageIncludes = new ArrayList<>(); - setAbortMessageExcludes("CHECK_"); + setAbortMessageExcludes("CHECK_", "CANNOT LINK EXECUTABLE"); processPatterns = new ArrayList(); } diff --git a/common/util/tests/src/com/android/compatibility/common/util/CrashUtilsTest.java b/common/util/tests/src/com/android/compatibility/common/util/CrashUtilsTest.java index 7ae31365c6b..2d80509cabb 100644 --- a/common/util/tests/src/com/android/compatibility/common/util/CrashUtilsTest.java +++ b/common/util/tests/src/com/android/compatibility/common/util/CrashUtilsTest.java @@ -192,4 +192,28 @@ public class CrashUtilsTest { .appendAbortMessageExcludes("exclude not matches") .setProcessPatterns(Pattern.compile("com\\.android\\.bluetooth")))); } + + @Test + public void testAbortMessageExcludeCannotLink() throws Exception { + JSONArray crashes = new JSONArray(); + crashes.put(createCrashJson( + 18959, 18959, "CVE-2020-0073", "/data/local/tmp/CVE-2020-0073", null, "SIGABRT", + "'CANNOT LINK EXECUTABLE \"/data/local/tmp/CVE-2020-0073\": library " + + "\"libnfc-nci.so\" (\"(default)\", \"/data/local/tmp/CVE-2020-0073\", \"\") " + + "not found'")); + Assert.assertFalse(CrashUtils.securityCrashDetected(crashes, new CrashUtils.Config() + .appendSignals(CrashUtils.SIGABRT) + .setProcessPatterns(Pattern.compile("CVE-2020-0073")))); + + crashes.put(createCrashJson( + 5105, 5105, "CVE-2015-6616-2", "/data/local/tmp/CVE-2015-6616-2", null, "SIGABRT", + "'CANNOT LINK EXECUTABLE \"/data/local/tmp/CVE-2015-6616-2\": " + + "cannot locate symbol \"" + + "_ZN7android14MediaExtractor17CreateFromServiceERKNS_2spINS_10DataSourceEEEPKc" + + "\" referenced by \"/data/local/tmp/CVE-2015-6616-2\"...'")); + Assert.assertFalse(CrashUtils.securityCrashDetected(crashes, new CrashUtils.Config() + .appendSignals(CrashUtils.SIGABRT) + .setProcessPatterns(Pattern.compile("CVE-2015-6616-2")))); + + } } |