* [merged] init-fix-misleading-this-architecture-does-not-have-kernel-memory-protection-message.patch removed from -mm tree
@ 2020-01-31 23:21 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-01-31 23:21 UTC (permalink / raw)
To: benh, christophe.leroy, keescook, mm-commits, mpe, paulus
The patch titled
Subject: init/main.c: fix misleading "This architecture does not have kernel memory protection" message
has been removed from the -mm tree. Its filename was
init-fix-misleading-this-architecture-does-not-have-kernel-memory-protection-message.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christophe Leroy <christophe.leroy@c-s.fr>
Subject: init/main.c: fix misleading "This architecture does not have kernel memory protection" message
This message leads to thinking that memory protection is not implemented
for the said architecture, whereas absence of CONFIG_STRICT_KERNEL_RWX
only means that memory protection has not been selected at compile time.
Don't print this message when CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is
selected by the architecture. Instead, print "Kernel memory protection
not selected by kernel config."
Link: http://lkml.kernel.org/r/62477e446d9685459d4f27d193af6ff1bd69d55f.1578557581.git.christophe.leroy@c-s.fr
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
init/main.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/init/main.c~init-fix-misleading-this-architecture-does-not-have-kernel-memory-protection-message
+++ a/init/main.c
@@ -1104,6 +1104,11 @@ static void mark_readonly(void)
} else
pr_info("Kernel memory protection disabled.\n");
}
+#elif defined(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX)
+static inline void mark_readonly(void)
+{
+ pr_warn("Kernel memory protection not selected by kernel config.\n");
+}
#else
static inline void mark_readonly(void)
{
_
Patches currently in -mm which might be from christophe.leroy@c-s.fr are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-31 23:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-31 23:21 [merged] init-fix-misleading-this-architecture-does-not-have-kernel-memory-protection-message.patch removed from -mm tree akpm
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).