summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2019-02-12 21:23:18 +0300
committerJames Morris <james.morris@microsoft.com>2019-02-26 02:22:48 +0300
commit89a9684ea158dd7eef1728be9f0aed9a7d41cf19 (patch)
treefaeed122fb3f70e927d14d7a587a5c634a0cbaf9 /Documentation/admin-guide
parente88ed488af0a70cbc925d2cce60788378bbe26e3 (diff)
downloadlinux-89a9684ea158dd7eef1728be9f0aed9a7d41cf19.tar.xz
LSM: Ignore "security=" when "lsm=" is specified
To avoid potential confusion, explicitly ignore "security=" when "lsm=" is used on the command line, and report that it is happening. Suggested-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: John Johansen <john.johansen@canonical.com> Signed-off-by: James Morris <james.morris@microsoft.com>
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index e59e1471d4db..91c0251fdb86 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2321,7 +2321,7 @@
lsm=lsm1,...,lsmN
[SECURITY] Choose order of LSM initialization. This
- overrides CONFIG_LSM.
+ overrides CONFIG_LSM, and the "security=" parameter.
machvec= [IA-64] Force the use of a particular machine-vector
(machvec) in a generic kernel.
@@ -4094,11 +4094,9 @@
Note: increases power consumption, thus should only be
enabled if running jitter sensitive (HPC/RT) workloads.
- security= [SECURITY] Choose a security module to enable at boot.
- If this boot parameter is not specified, only the first
- security module asking for security registration will be
- loaded. An invalid security module name will be treated
- as if no module has been chosen.
+ security= [SECURITY] Choose a legacy "major" security module to
+ enable at boot. This has been deprecated by the
+ "lsm=" parameter.
selinux= [SELINUX] Disable or enable SELinux at boot time.
Format: { "0" | "1" }