aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Marwaha <vikasmarwaha@google.com>2018-03-07 20:38:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-07 20:38:41 +0000
commit85a4240862bddec633e1a3a73c95212b95844ce4 (patch)
treeb6629f7e91c183aa2f90ca1c4f2fa6d8183c485d
parent027d7f02af388efd9f9655f89505414085d53f9a (diff)
parentab75ac73a15e00c2bdeceb3a4eeda4ca243182e4 (diff)
downloadplatform_compatibility_cdd-85a4240862bddec633e1a3a73c95212b95844ce4.tar.gz
platform_compatibility_cdd-85a4240862bddec633e1a3a73c95212b95844ce4.tar.bz2
platform_compatibility_cdd-85a4240862bddec633e1a3a73c95212b95844ce4.zip
am: ab75ac73a1 Change-Id: I9e7a3349b07a45559129352cc14d397ced014266
-rw-r--r--9_security-model/9_7_kernel-security-features.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/9_security-model/9_7_kernel-security-features.md b/9_security-model/9_7_kernel-security-features.md
index a6a5d8d3..e4aebaa0 100644
--- a/9_security-model/9_7_kernel-security-features.md
+++ b/9_security-model/9_7_kernel-security-features.md
@@ -30,8 +30,9 @@ synchronization (TSYNC) as described
Kernel integrity and self-protection features are integral to Android
security. Device implementations:
-* [C-0-7] MUST implement kernel stack buffer overflow protections
-(e.g. `CONFIG_CC_STACKPROTECTOR_STRONG`).
+* [C-0-7] MUST implement kernel stack buffer overflow protection mechanisms.
+Examples of such mechanisms are `CC_STACKPROTECTOR_REGULAR` and
+`CONFIG_CC_STACKPROTECTOR_STRONG`.
* [C-0-8] MUST implement strict kernel memory protections where executable
code is read-only, read-only data is non-executable and non-writable, and
writable data is non-executable (e.g. `CONFIG_DEBUG_RODATA` or `CONFIG_STRICT_KERNEL_RWX`).
@@ -72,4 +73,4 @@ policy for their own device-specific configuration.
If device implementations use kernel other than Linux, they:
* [C-2-1] MUST use an mandatory access control system that is
-equivalent to SELinux. \ No newline at end of file
+equivalent to SELinux.