kaiser: user_map __kprobes_text too

In 3.2 (and earlier, and up to 3.15) Kaiser needs to user_map the
__kprobes_text as well as the __entry_text: entry_64.S places some
vital functions there, so without this you very soon triple-fault.
Many thanks to Jiri Kosina for pointing me in this direction.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index ab1dfa6..fb16d79 100644 (file)
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -281,6 +281,8 @@ void __init kaiser_init(void)
         */
        kaiser_add_user_map_ptrs_early(__entry_text_start, __entry_text_end,
                                       __PAGE_KERNEL_RX);
+       kaiser_add_user_map_ptrs_early(__kprobes_text_start, __kprobes_text_end,
+                                      __PAGE_KERNEL_RX);
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        kaiser_add_user_map_ptrs_early(__irqentry_text_start,
                                       __irqentry_text_end,