Merge pi-dev as of ag/4582919 into stage-aosp-master.
Bug: 112189069
Change-Id: I67297b2d6eb189283acb350c1001010f0e9c81d9
diff --git a/9_security-model/9_7_security-features.md b/9_security-model/9_7_security-features.md
index 245f5b6..84db962 100644
--- a/9_security-model/9_7_security-features.md
+++ b/9_security-model/9_7_security-features.md
@@ -32,8 +32,9 @@
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`).
