From: Pranith Kumar <bobby.prani@gmail.com>
To: James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Thomas Gleixner <tglx@linutronix.de>,
Qais Yousef <qais.yousef@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
Tyler Hicks <tyhicks@canonical.com>,
linux-kernel@vger.kernel.org (open list),
linux-security-module@vger.kernel.org (open list:SECURITY
SUBSYSTEM)
Subject: [RFC PATCH] security: Add a config option to disable security mitigations
Date: Wed, 17 Jun 2020 18:07:54 -0700 [thread overview]
Message-ID: <20200618010755.4179-1-bobby.prani@gmail.com> (raw)
Instead of having to pass 'mitigations=off' on the kernel command line,
add a config option that has a similar effect.
Adding this makes it easier to disable mitigations in scenarios where
you cannot modify the command line or are unable to pass a command line
while booting.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
kernel/cpu.c | 2 +-
security/Kconfig | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 6ff2578ecf17..584eb39585d6 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -2542,7 +2542,7 @@ early_param("mitigations", mitigations_parse_cmdline);
/* mitigations=off */
bool cpu_mitigations_off(void)
{
- return cpu_mitigations == CPU_MITIGATIONS_OFF;
+ return cpu_mitigations == CPU_MITIGATIONS_OFF || IS_ENABLED(CONFIG_DISABLE_MITIGATIONS);
}
EXPORT_SYMBOL_GPL(cpu_mitigations_off);
diff --git a/security/Kconfig b/security/Kconfig
index cd3cc7da3a55..90b8e9c89a6d 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -65,6 +65,14 @@ config PAGE_TABLE_ISOLATION
See Documentation/x86/pti.rst for more details.
+config DISABLE_MITIGATIONS
+ bool "Disable kernel security mitigations"
+ default n
+ help
+ This turns off the kernel security mitigations. This is
+ equivalent to passing 'mitigations=off' on the kernel
+ command line.
+
config SECURITY_INFINIBAND
bool "Infiniband Security Hooks"
depends on SECURITY && INFINIBAND
--
2.27.0
next reply other threads:[~2020-06-18 1:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 1:07 Pranith Kumar [this message]
2020-06-22 12:32 ` [RFC PATCH] security: Add a config option to disable security mitigations Qais Yousef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200618010755.4179-1-bobby.prani@gmail.com \
--to=bobby.prani@gmail.com \
--cc=arnd@arndb.de \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=qais.yousef@arm.com \
--cc=serge@hallyn.com \
--cc=tglx@linutronix.de \
--cc=tyhicks@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox