FAILED: patch "[PATCH] extable: Consolidate *kernel_text_address() functions" failed to apply to 4.9-stable tree
[email protected]
maintainerThe patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
9aadde91b3c035413c806619beb3e3ef6e697953Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 22 Sep 2017 17:22:19 -0400
Subject: [PATCH] extable: Consolidate *kernel_text_address() functions
The functionality between kernel_text_address() and _kernel_text_address() is the same except that _kernel_text_address() does a little more (that function needs a rename, but that can be done another time). Instead of having duplicate code in both, simply have _kernel_text_address() calls kernel_text_address() instead.
This is marked for stable because there's an RCU bug that can happen if one of these functions gets called while RCU is not watching. That fix depends on this fix to keep from having to write the fix twice.
kernel/extable.c +1 -9
@@ -102,15 +102,7 @@ int core_kernel_data(unsigned long addr)int __kernel_text_address (unsigned long addr) { -if (core_kernel_text (addr)) -return 1 ; -if (is_module_text_address (addr)) -return 1 ; -if (is_ftrace_trampoline (addr)) -return 1 ; -if (is_kprobe_optinsn_slot (addr) ||is_kprobe_insn_slot (addr)) -return 1 ; -if (is_bpf_text_address (addr)) +if (kernel_text_address (addr))return 1 ;/* * There might be init symbols in saved stacktraces.