diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2024-01-09 21:06:52 +0000 |
|---|---|---|
| committer | Sami Tolvanen <samitolvanen@google.com> | 2024-02-15 21:07:58 +0000 |
| commit | 68f866702930ff50a223edba75aea3cf17dbdd22 (patch) | |
| tree | b8e2e83067373c90258bba54cdba4c37a7198593 | |
| parent | 3610907a2b8fd449665d30b09085234e5eb04dd9 (diff) | |
| download | configs-68f866702930ff50a223edba75aea3cf17dbdd22.tar.gz | |
v: 6.x: Update to match VSR 3.4.6 kernel security requirements
Require CONFIG_CFI_CLANG on arm64 and x86_64. Note that CONFIG_SHADOW_CALL_STACK
is already required on arm64, and CONFIG_RANDOMIZE_BASE is required on arm64 and
x86, so no changes are needed for SCS/KASLR.
Bug: 295216321
Bug: 314198880
Test: presubmit
Change-Id: Ib8981ac14384c7c9afa6634322dc8382450dd951
| -rw-r--r-- | v/android-6.1/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | v/android-6.6/android-base-conditional.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/v/android-6.1/android-base-conditional.xml b/v/android-6.1/android-base-conditional.xml index a85563a..ec0c9f8 100644 --- a/v/android-6.1/android-base-conditional.xml +++ b/v/android-6.1/android-base-conditional.xml @@ -47,10 +47,10 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -147,10 +147,10 @@ <value type="bool">y</value> </config> </conditions> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> diff --git a/v/android-6.6/android-base-conditional.xml b/v/android-6.6/android-base-conditional.xml index d049e81..cb7cd51 100644 --- a/v/android-6.6/android-base-conditional.xml +++ b/v/android-6.6/android-base-conditional.xml @@ -47,10 +47,10 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -147,10 +147,10 @@ <value type="bool">y</value> </config> </conditions> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> |