diff options
| author | Alexander Potapenko <glider@google.com> | 2021-03-15 17:58:52 +0100 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2021-03-16 18:44:47 +0100 |
| commit | 27a2a0b7528193c4a5797463cb0e3fef274814dc (patch) | |
| tree | 28ec27cb45b8b935bbe2080ce13d9d47c658bd30 | |
| parent | 01a706ce6e753d06c97af3bb7bad43caba5f92f0 (diff) | |
| download | configs-27a2a0b7528193c4a5797463cb0e3fef274814dc.tar.gz | |
CONFIG_KFENCE requirements for 5.4 and 5.10 kernels
CONFIG_KFENCE=y MUST be enabled in all 5.10 kernels and
is STRONGLY RECOMMENDED in 5.4 kernels.
Having CONFIG_KFENCE=y does not necessarily enable KFENCE at runtime:
it can still be disabled by setting CONFIG_KFENCE_SAMPLE_INTERVAL=0
or passing kfence.sample_interval=0 boot parameter to the kernel.
Bug: 181118352
Bug: 176230369
Test: manual (5.10), Treehugger (5.4)
Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: Ie075c79b42bf4d4d19429e28afec08d7efbc980b
| -rw-r--r-- | android-5.10/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | android-5.4/android-recommended-arm64.config | 1 | ||||
| -rw-r--r-- | android-5.4/android-recommended-x86.config | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml index 398cb8b..04ac88d 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -84,6 +84,10 @@ <value type="bool">y</value> </config> <config> + <key>CONFIG_KFENCE</key> + <value type="bool">y</value> + </config> + <config> <key>CONFIG_USERFAULTFD</key> <value type="bool">y</value> </config> @@ -102,6 +106,10 @@ <value type="bool">n</value> </config> <config> + <key>CONFIG_KFENCE</key> + <value type="bool">y</value> + </config> + <config> <key>CONFIG_PAGE_TABLE_ISOLATION</key> <value type="bool">y</value> </config> diff --git a/android-5.4/android-recommended-arm64.config b/android-5.4/android-recommended-arm64.config index 16ec836..755dfc3 100644 --- a/android-5.4/android-recommended-arm64.config +++ b/android-5.4/android-recommended-arm64.config @@ -3,5 +3,6 @@ CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_SW_TTBR0_PAN=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_KFENCE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RELOCATABLE=y diff --git a/android-5.4/android-recommended-x86.config b/android-5.4/android-recommended-x86.config index 0388b3f..fe497f2 100644 --- a/android-5.4/android-recommended-x86.config +++ b/android-5.4/android-recommended-x86.config @@ -1,5 +1,6 @@ # KEEP ALPHABETICALLY SORTED CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_SHA256_SSSE3=y +CONFIG_KFENCE=y CONFIG_RANDOMIZE_BASE=y CONFIG_RELOCATABLE=y |