[RESTRICT AUTOMERGE] CTS test for Android Security b/62896384
Bug: 62896384
Bug: 72440175
Test: Ran the new testcase on android-8.0.0_r30 with/without patch
Change-Id: I25c6b32519a7b8f7f370f4d8ae8e257ffd8d4229
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
index 166b2a6..d50960a 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
@@ -159,6 +159,11 @@
* This binary only exists in 32-bit.
*/
BINARY_EXCEPTIONS.add("CVE-2017-083232");
+
+ /**
+ * This binary only exists in 32-bit.
+ */
+ BINARY_EXCEPTIONS.add("CVE-2017-083332");
}
/**
diff --git a/hostsidetests/securitybulletin/AndroidTest.xml b/hostsidetests/securitybulletin/AndroidTest.xml
index 2a59347..994bbd0 100644
--- a/hostsidetests/securitybulletin/AndroidTest.xml
+++ b/hostsidetests/securitybulletin/AndroidTest.xml
@@ -277,6 +277,7 @@
<option name="cleanup" value="true" />
<!-- Please add 32-bit binary tests below to avoid merge conflict -->
+ <option name="push" value="CVE-2017-083332->/data/local/tmp/CVE-2017-0833" />
<option name="push" value="CVE-2017-083232->/data/local/tmp/CVE-2017-0832" />
<option name="push" value="CVE-2017-085132->/data/local/tmp/CVE-2017-0851" />
<option name="push" value="CVE-2017-1315032->/data/local/tmp/CVE-2017-13150" />
diff --git a/hostsidetests/securitybulletin/res/cve_2017_0833.h264 b/hostsidetests/securitybulletin/res/cve_2017_0833.h264
new file mode 100644
index 0000000..224d421
--- /dev/null
+++ b/hostsidetests/securitybulletin/res/cve_2017_0833.h264
Binary files differ
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0833/Android.mk b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0833/Android.mk
new file mode 100644
index 0000000..ecad327
--- /dev/null
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0833/Android.mk
@@ -0,0 +1,42 @@
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#=========================================================================
+# NOTE: This module uses the libavc's testbench from external folder
+# without creating a copy of the testbench locally. Hence LOCAL_SRC_FILES
+# is pointed to external folder.
+# This module is dependent on external/libavc/test
+#=========================================================================
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := CVE-2017-0833
+LOCAL_SRC_FILES := ../../../../../external/libavc/test/decoder/main.c
+LOCAL_SRC_FILES += ../includes/memutils.c
+LOCAL_MULTILIB := 32
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_C_INCLUDES := external/libavc/common
+LOCAL_C_INCLUDES += external/libavc/decoder
+LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES += libstagefright_soft_avcdec
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts sts vts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS += -Wall -Werror
+LOCAL_CFLAGS += -DPROFILE_ENABLE -fPIC -DMD5_DISABLE -DCHECK_OVERFLOW -DCHECK_USE_AFTER_FREE_WITH_WINDOW_SIZE=16384000
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
index 76deb96..93d4d45 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
@@ -181,6 +181,18 @@
******************************************************************************/
/**
+ * b/62896384
+ * Vulnerability Behaviour: SIGSEGV in self
+ **/
+ @SecurityTest(minPatchLevel = "2017-11")
+ public void testPocCVE_2017_0833() throws Exception {
+ String inputFiles[] = {"cve_2017_0833.h264"};
+ AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0833",
+ "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " --num_frames -1 --num_cores 2",
+ inputFiles, AdbUtils.TMP_PATH, getDevice());
+ }
+
+ /**
* b/63521984
**/
@Test
