Merge "Remove testNoLoadableModules()" into jb-mr2-dev
diff --git a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
index f8ee283..90136da 100644
--- a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
+++ b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
@@ -88,27 +88,6 @@
}
/**
- * Assert that support for loadable modules is not compiled into the
- * kernel.
- *
- * Loadable modules are often used to implement rootkit like functionality.
- * In addition, loadable modules enable support for /proc/sys/kernel/modprobe,
- * which is commonly used by exploit writers to gain root access.
- *
- * Support for loadable modules can be removed by editing the Linux kernel
- * config and removing the CONFIG_MODULES option.
- */
- public void testNoLoadableModules() throws IOException {
- assertFalse(
- "Support for loadable modules is compiled into the kernel. "
- + "Loadable modules are often used by rootkits and other "
- + "exploits and should be disabled. Please remove "
- + "CONFIG_MODULES from your kernel config and compile "
- + "all modules directly into the kernel.",
- new File("/proc/sys/kernel/modprobe").exists());
- }
-
- /**
* Assert that the kernel config file is not compiled into the kernel.
*
* Compiling the config file into the kernel leaks the kernel base address