From: Kees Cook <keescook@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Andy Lutomirski <luto@amacapital.net>,
"H. Peter Anvin" <hpa@zytor.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Mathias Krause <minipli@googlemail.com>,
Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, Arnd Bergmann <arnd@arndb.de>,
PaX Team <pageexec@freemail.hu>, Emese Revfy <re.emese@gmail.com>,
kernel-hardening@lists.openwall.com,
linux-arch <linux-arch@vger.kernel.org>
Subject: [kernel-hardening] [PATCH v2 1/4] init: create cmdline param to disable readonly
Date: Wed, 25 Nov 2015 15:31:23 -0800 [thread overview]
Message-ID: <1448494286-16029-2-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1448494286-16029-1-git-send-email-keescook@chromium.org>
It may be useful to debug writes to the readonly sections of memory,
so provide a cmdline "rodata=off" to allow for this.
Suggested-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
Documentation/kernel-parameters.txt | 4 ++++
init/main.c | 31 +++++++++++++++++++++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 742f69d18fc8..21cf76dbba90 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3409,6 +3409,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
ro [KNL] Mount root device read-only on boot
+ rodata= [KNL]
+ on Mark read-only kernel memory as read-only (default).
+ off Leave read-only kernel memory writable for debugging.
+
root= [KNL] Root filesystem
See name_to_dev_t comment in init/do_mounts.c.
diff --git a/init/main.c b/init/main.c
index 9e64d7097f1a..06200d2fbf08 100644
--- a/init/main.c
+++ b/init/main.c
@@ -93,9 +93,6 @@ static int kernel_init(void *);
extern void init_IRQ(void);
extern void fork_init(void);
extern void radix_tree_init(void);
-#ifndef CONFIG_DEBUG_RODATA
-static inline void mark_rodata_ro(void) { }
-#endif
/*
* Debug helper: via this flag we know that we are in 'early bootup code'
@@ -929,6 +926,32 @@ static int try_to_run_init_process(const char *init_filename)
static noinline void __init kernel_init_freeable(void);
+#ifdef CONFIG_DEBUG_RODATA
+bool disable_mark_readonly;
+static int __init set_debug_rodata(char *str)
+{
+ if (!str)
+ return -EINVAL;
+ if (!strncmp(str, "on", 2))
+ disable_mark_readonly = false;
+ else if (!strncmp(str, "off", 3))
+ disable_mark_readonly = true;
+
+ return 0;
+}
+__setup("rodata=", set_debug_rodata);
+
+static void mark_readonly(void)
+{
+ if (disable_mark_readonly)
+ pr_info("Kernel read-only memory marking disabled.\n");
+ else
+ mark_rodata_ro();
+}
+#else
+static inline void mark_readonly(void) { };
+#endif
+
static int __ref kernel_init(void *unused)
{
int ret;
@@ -937,7 +960,7 @@ static int __ref kernel_init(void *unused)
/* need to finish all async __init code before freeing the memory */
async_synchronize_full();
free_initmem();
- mark_rodata_ro();
+ mark_readonly();
system_state = SYSTEM_RUNNING;
numa_default_policy();
--
1.9.1
next prev parent reply other threads:[~2015-11-25 23:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 23:31 [kernel-hardening] [PATCH v2 0/4] introduce post-init read-only memory Kees Cook
2015-11-25 23:31 ` Kees Cook [this message]
2015-11-26 0:37 ` [kernel-hardening] Re: [PATCH v2 1/4] init: create cmdline param to disable readonly PaX Team
2015-11-26 0:44 ` [kernel-hardening] " Greg KH
2015-11-26 7:51 ` [kernel-hardening] " Ingo Molnar
2015-11-30 21:52 ` Kees Cook
2015-11-30 22:24 ` Russell King - ARM Linux
2015-11-30 22:34 ` Kees Cook
2015-12-01 7:24 ` Ingo Molnar
2015-12-01 7:19 ` Heiko Carstens
2015-11-25 23:31 ` [kernel-hardening] [PATCH v2 2/4] introduce post-init read-only memory Kees Cook
2015-11-26 0:15 ` [kernel-hardening] " PaX Team
2015-11-30 22:24 ` H. Peter Anvin
2015-12-09 19:35 ` Kees Cook
2015-11-25 23:31 ` [kernel-hardening] [PATCH v2 3/4] lkdtm: verify that __ro_after_init works correctly Kees Cook
2015-11-25 23:31 ` [kernel-hardening] [PATCH v2 4/4] x86, vdso: mark vDSO read-only after init Kees Cook
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=1448494286-16029-2-git-send-email-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=minipli@googlemail.com \
--cc=mpe@ellerman.id.au \
--cc=pageexec@freemail.hu \
--cc=re.emese@gmail.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).