commit 80ae4455a94f71fae8ce589356933c2504ba241e
author Christopher Dombroski <cdombroski@google.com> Tue Mar 09 17:03:36 2021 -0800
committer Christopher Dombroski <cdombroski@google.com> Tue Mar 09 17:17:48 2021 -0800
tree bb0a793362a22c24b1c7bfe72f75f8dbc84be236
parent 2e40c12e054da38849cff6be1854a61678c9f61a

STS add check exclude for CVE-2018-9537

Bug: 117433881
Bug: 174336265
Test: sts-tradefed run sts-engbuild-no-spl-lock -m CtsSecurityBulletinHostTestCases -t android.security.cts.TestMedia#testPocCVE_2018_9537

Change-Id: Ie2d59e9b539dc178dfd89d27cf2d92662ee19488

hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java

diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
index 9df834d..353c825 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
@@ -611,7 +611,11 @@
         String binaryName = "CVE-2018-9537";
         String signals[] = {CrashUtils.SIGSEGV, CrashUtils.SIGBUS, CrashUtils.SIGABRT};
         AdbUtils.pocConfig testConfig = new AdbUtils.pocConfig(binaryName, getDevice());
-        testConfig.config = new CrashUtils.Config().setProcessPatterns(binaryName);
+        // example of check crash to skip:
+        // Abort message: 'frameworks/av/media/extractors/mkv/MatroskaExtractor.cpp:548 CHECK(mCluster) failed.'
+        testConfig.config = new CrashUtils.Config()
+                .setProcessPatterns(binaryName)
+                .appendAbortMessageExcludes("CHECK\\(.*?\\)");
         testConfig.config.setSignals(signals);
         AdbUtils.runPocAssertNoCrashesNotVulnerable(testConfig);
     }