diff options
| author | Kees Cook <keescook@chromium.org> | 2019-02-12 10:23:18 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-02-25 15:22:48 -0800 |
| commit | 89a9684ea158dd7eef1728be9f0aed9a7d41cf19 (patch) | |
| tree | faeed122fb3f70e927d14d7a587a5c634a0cbaf9 /security | |
| parent | e88ed488af0a70cbc925d2cce60788378bbe26e3 (diff) | |
| download | linux-rpi-89a9684ea158dd7eef1728be9f0aed9a7d41cf19.tar.gz linux-rpi-89a9684ea158dd7eef1728be9f0aed9a7d41cf19.tar.bz2 linux-rpi-89a9684ea158dd7eef1728be9f0aed9a7d41cf19.zip | |
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 'security')
| -rw-r--r-- | security/security.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index b6bff646d373..ed9b8cbf21cf 100644 --- a/security/security.c +++ b/security/security.c @@ -288,9 +288,13 @@ static void __init ordered_lsm_init(void) ordered_lsms = kcalloc(LSM_COUNT + 1, sizeof(*ordered_lsms), GFP_KERNEL); - if (chosen_lsm_order) + if (chosen_lsm_order) { + if (chosen_major_lsm) { + pr_info("security= is ignored because it is superseded by lsm=\n"); + chosen_major_lsm = NULL; + } ordered_lsm_parse(chosen_lsm_order, "cmdline"); - else + } else ordered_lsm_parse(builtin_lsm_order, "builtin"); for (lsm = ordered_lsms; *lsm; lsm++) |