aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Song <[email protected]>2022-06-24 09:20:48 +0800
committerWill Deacon <[email protected]>2022-06-28 15:08:01 +0100
commite92b25731ef6c21471a79404cebb0f6738096f77 (patch)
tree6b36222bd3261b50681b0a1964eb67a862182fa3
parent1c9a8e87680870d5daf1eaa6314373dcc156ac15 (diff)
arm64: correct the effect of mitigations off on kpti
If KASLR is enabled, then kpti will be forced to be enabled even if mitigations off, so we need to adjust the description of this parameter. Signed-off-by: Liu Song <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2522b11e593f..1f5f9c1c96df 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3161,7 +3161,7 @@
improves system performance, but it may also
expose users to several CPU vulnerabilities.
Equivalent to: nopti [X86,PPC]
- kpti=0 [ARM64]
+ if nokaslr then kpti=0 [ARM64]
nospectre_v1 [X86,PPC]
nobp=0 [S390]
nospectre_v2 [X86,PPC,S390,ARM64]