commit 204fb71e096b161d6fdbfed1ae8114ef8d7c7170
author Goraksh Shinde <gorakshs@google.com> Tue Jun 12 15:08:40 2018 -0700
committer Goraksh Shinde <gorakshs@google.com> Wed Jun 13 17:44:27 2018 +0000
tree 8b56a5e254d10e9e752f1de40e0bc666ede2b08f
parent d406dd52a07b5a80770d1c83a11b2e56f264c84f

RESTRICT AUTOMERGE : CTS test for Android Security b/72460579 b/34277115

Test: successful run of newly introduced CTS test case.
Bug:72460579
Bug:34277115
Change-Id: I534c4a36a589ff511f15b82452f140561069f5fe

hostsidetests/security/src/android/security/cts/Poc17_05.java

diff --git a/hostsidetests/security/src/android/security/cts/Poc17_05.java b/hostsidetests/security/src/android/security/cts/Poc17_05.java
index dac7462..aa0007d 100644
--- a/hostsidetests/security/src/android/security/cts/Poc17_05.java
+++ b/hostsidetests/security/src/android/security/cts/Poc17_05.java
@@ -46,4 +46,16 @@
                          "[\\s\\n\\S]*>>> /system/bin/" +
                          "mediaserver <<<[\\s\\n\\S]*", logcatOut);
     }
+
+    /**
+     *  b/34277115
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0630() throws Exception {
+        if (containsDriver(getDevice(), "/sys/kernel/debug/tracing/printk_formats")) {
+          String commandOutput = AdbUtils.runCommandLine("cat /sys/kernel/debug/tracing" +
+                                                         "/printk_formats", getDevice());
+          assertNotMatchesMultiLine(".*0x(?!0){8,16}[0-9a-fA-F]{8,16} : .*", commandOutput);
+        }
+    }
 }