Merge tag 'x86-splitlock-2021-04-26' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index aef927c..0136cdf 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4061,6 +4061,17 @@
                        fully seed the kernel's CRNG. Default is controlled
                        by CONFIG_RANDOM_TRUST_CPU.
 
+       randomize_kstack_offset=
+                       [KNL] Enable or disable kernel stack offset
+                       randomization, which provides roughly 5 bits of
+                       entropy, frustrating memory corruption attacks
+                       that depend on stack address determinism or
+                       cross-syscall address exposures. This is only
+                       available on architectures that have defined
+                       CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET.
+                       Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
+                       Default is CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT.
+
        ras=option[,option,...] [KNL] RAS-specific options
 
                cec_disable     [X86]
@@ -5472,6 +5483,18 @@
                        See Documentation/admin-guide/mm/transhuge.rst
                        for more details.
 
+       trusted.source= [KEYS]
+                       Format: <string>
+                       This parameter identifies the trust source as a backend
+                       for trusted keys implementation. Supported trust
+                       sources:
+                       - "tpm"
+                       - "tee"
+                       If not specified then it defaults to iterating through
+                       the trust source list starting with TPM and assigns the
+                       first trust source as a backend which is initialized
+                       successfully during iteration.
+
        tsc=            Disable clocksource stability checks for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this