Merge "STS test for Android Security CVE-2021-0306" into oc-dev
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk
index 1dd66a6..b3389c9 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk
@@ -21,7 +21,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts sts
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
index 453dbcb..52236e1 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
@@ -24,7 +24,7 @@
legacy-android-test
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts sts
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
index 4cd5d79..86c4e5a 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
@@ -24,7 +24,7 @@
legacy-android-test
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts sts
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk
index afd8903..ad987ac 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk
@@ -21,7 +21,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts sts
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
index 92aa626..81100e6 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
@@ -33,29 +33,14 @@
* b/162741784
*/
@Test
- @SecurityTest(minPatchLevel = "2020-11")
+ @SecurityTest(minPatchLevel = "2020-12")
public void testPocCVE_2020_0461() throws Exception {
- //conditions
- String cpu = AdbUtils.runCommandLine("getprop ro.product.cpu.abi", getDevice());
- assumeThat(cpu, equalTo("arm64-v8a"));
- assumeTrue(containsDriver(getDevice(), "/proc/config.gz"));
assumeTrue(containsDriver(getDevice(),
- "/sys/devices/system/cpu/vulnerabilities/meltdown"));
+ "/sys/devices/system/cpu/vulnerabilities/meltdown"));
String meltdown = AdbUtils.runCommandLine(
- "cat /sys/devices/system/cpu/vulnerabilities/meltdown", getDevice());
- assumeThat(meltdown, equalTo("Vulnerable"));
-
- //test
- AdbUtils.runCommandLine("cp /proc/config.gz /data/local/tmp", getDevice());
- AdbUtils.runCommandLine("gunzip /data/local/tmp/config.gz", getDevice());
- String output = AdbUtils.runCommandLine(
- "grep CONFIG_UNMAP_KERNEL_AT_EL0 /data/local/tmp/config", getDevice());
- AdbUtils.runCommandLine("rm /data/local/tmp/config", getDevice());
-
- // This is a bad output
- // "" - empty output
- // "CONFIG_UNMAP_KERNEL_AT_EL0 is not set"
- assertFalse(output.isEmpty());
- assertNotMatches("is not set", output);
+ "cat /sys/devices/system/cpu/vulnerabilities/meltdown", getDevice());
+ assertFalse(meltdown.startsWith("Vulnerable"));
+ assertTrue(meltdown.startsWith("Not affected") ||
+ meltdown.startsWith("Mitigation"));
}
}
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0462.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0462.java
new file mode 100644
index 0000000..fe42a0b
--- /dev/null
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0462.java
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+
+package android.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.*;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class CVE_2020_0462 extends SecurityTestCase {
+
+ /**
+ * b/169161709
+ */
+ @Test
+ @SecurityTest(minPatchLevel = "2020-12")
+ public void testPocCVE_2020_0462() throws Exception {
+ assumeTrue(containsDriver(getDevice(),
+ "/sys/devices/system/cpu/vulnerabilities/spec_store_bypass"));
+ String spec_store_bypass = AdbUtils.runCommandLine(
+ "cat /sys/devices/system/cpu/vulnerabilities/spec_store_bypass", getDevice());
+ assertFalse(spec_store_bypass.startsWith("Vulnerable"));
+ assertTrue(spec_store_bypass.startsWith("Not affected") ||
+ spec_store_bypass.startsWith("Mitigation"));
+ }
+}