diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-29 23:57:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-29 23:57:31 +0000 |
| commit | 84b4130529bdf6d1f2cbe314b5f4e62aaa169beb (patch) | |
| tree | db25a955c537489a41087b4719ba7b16bc533f14 | |
| parent | 9bb2b146cf0ffa9b4ec570ad52cfc33519ab55c2 (diff) | |
| parent | 0d49a6a151c2dfbb782b43bbf7d2fc4a314c97ff (diff) | |
| download | cts-84b4130529bdf6d1f2cbe314b5f4e62aaa169beb.tar.gz | |
Merge "Reverting CVE-2017-0630" into oc-mr1-dev am: 01e7dd3e17 am: 1393522107 am: a49434e149 am: 87648f2664 am: 0d49a6a151
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13998610
Change-Id: I1f9476eb3c0d97343386d8f3174a76da595c23a3
| -rw-r--r-- | hostsidetests/securitybulletin/src/android/security/cts/Poc17_05.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/Poc17_05.java b/hostsidetests/securitybulletin/src/android/security/cts/Poc17_05.java index 1ec6d891e6b..797e58d76e0 100644 --- a/hostsidetests/securitybulletin/src/android/security/cts/Poc17_05.java +++ b/hostsidetests/securitybulletin/src/android/security/cts/Poc17_05.java @@ -29,35 +29,6 @@ import static org.junit.Assert.*; @RunWith(DeviceJUnit4ClassRunner.class) public class Poc17_05 extends SecurityTestCase { - /** - * b/34277115 - */ - @Test - @SecurityTest(minPatchLevel = "2017-05") - public void testPocCVE_2017_0630() throws Exception { - if (containsDriver(getDevice(), "/sys/kernel/debug/tracing/printk_formats")) { - String printkFormats = AdbUtils.runCommandLine( - "cat /sys/kernel/debug/tracing/printk_formats", getDevice()); - String[] pointerStrings = printkFormats.split("\n"); - assertNotKernelPointer(new Callable<String>() { - int index; - @Override - public String call() { - for (; index < pointerStrings.length; index++) { - String line = pointerStrings[index]; - String pattern = "0x"; - int startIndex = line.indexOf(pattern); - if (startIndex == -1) { - continue; - } - return line.substring(startIndex + pattern.length()); - } - return null; - } - }, null); - } - } - /* * CVE-2016-5862 */ |