| commit | d9d5680526b35ddfd305c45b95d0d0cbf3ed1f60 | [log] [tgz] |
|---|---|---|
| author | Raj Mamadgi <r.mamadgi@samsung.com> | Tue Nov 20 10:23:13 2018 -0800 |
| committer | Raj M <r.mamadgi@samsung.com> | Tue Nov 20 18:33:50 2018 +0000 |
| tree | ee79a7f7e238267173f702d05a6cbb7cd1d39821 | |
| parent | b7d35ce25b5d4807427356dda44704d498147020 [diff] |
Check if RKP is enabled For cdd req 9.7 RKP can have equal protection. If RKP is enabled dont check for RODATA config. BUG:118338434 Change-Id: I2a030340314cbde4b82bfecd181bc12a357a625a Signed-off-by: Raj Mamadgi <r.mamadgi@samsung.com>
diff --git a/hostsidetests/security/src/android/security/cts/KernelConfigTest.java b/hostsidetests/security/src/android/security/cts/KernelConfigTest.java index 00962d0..bec7a9c 100644 --- a/hostsidetests/security/src/android/security/cts/KernelConfigTest.java +++ b/hostsidetests/security/src/android/security/cts/KernelConfigTest.java
@@ -123,6 +123,9 @@ */ @CddTest(requirement="9.7") public void testConfigROData() throws Exception { + if (configSet.contains("CONFIG_UH_RKP=y")) + return; + assertTrue("Linux kernel must have RO data enabled: " + "CONFIG_DEBUG_RODATA=y or CONFIG_STRICT_KERNEL_RWX=y", configSet.contains("CONFIG_DEBUG_RODATA=y") ||