From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:56042 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750957AbdJBL7w (ORCPT ); Mon, 2 Oct 2017 07:59:52 -0400 Subject: Patch "extable: Consolidate *kernel_text_address() functions" has been added to the 4.13-stable tree To: rostedt@goodmis.org, gregkh@linuxfoundation.org, paulmck@linux.vnet.ibm.com Cc: , From: Date: Mon, 02 Oct 2017 14:00:00 +0200 Message-ID: <150694560017783@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled extable: Consolidate *kernel_text_address() functions to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: extable-consolidate-kernel_text_address-functions.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 9aadde91b3c035413c806619beb3e3ef6e697953 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (VMware)" Date: Fri, 22 Sep 2017 17:22:19 -0400 Subject: extable: Consolidate *kernel_text_address() functions From: Steven Rostedt (VMware) commit 9aadde91b3c035413c806619beb3e3ef6e697953 upstream. 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. Fixes: 0be964be0 ("module: Sanitize RCU usage and locking") Acked-by: Paul E. McKenney Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/extable.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/kernel/extable.c +++ b/kernel/extable.c @@ -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. Patches currently in stable-queue which might be from rostedt@goodmis.org are queue-4.13/extable-enable-rcu-if-it-is-not-watching-in-kernel_text_address.patch queue-4.13/tracing-erase-irqsoff-trace-with-empty-write.patch queue-4.13/tracing-fix-trace_pipe-behavior-for-instance-traces.patch queue-4.13/rcu-allow-for-page-faults-in-nmi-handlers.patch queue-4.13/genirq-fix-cpumask-check-in-__irq_startup_managed.patch queue-4.13/tracing-remove-rcu-work-arounds-from-stack-tracer.patch queue-4.13/extable-consolidate-kernel_text_address-functions.patch