Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1682396 > unrolled thread

[for-next][PATCH 0/3] tracing: Last minute updates for 4.13

Back to article view | Back to linux.kernel

Contents

  [for-next][PATCH 0/3] tracing: Last minute updates for 4.13 Steven Rostedt <rostedt@goodmis.org> - 2017-07-06 14:30 +0200
    [for-next][PATCH 3/3] ftrace: Test for NULL iter->tr in regex for stack_trace_filter  changes Steven Rostedt <rostedt@goodmis.org> - 2017-07-06 14:30 +0200

#1682396 — [for-next][PATCH 0/3] tracing: Last minute updates for 4.13

Some quick fixes for 4.13, includes merging a fix that was already
sent to mainline.

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 69d71879d2cf67a381055f698a1d7def00dc4ed7


Steven Rostedt (VMware) (4):
      ftrace: Decrement count for dyn_ftrace_total_info for init functions
      ftrace: Fix regression with module command in stack_trace_filter
      Merge commit '0f17976568b3f72e676450af0c0db6f8752253d6' into trace/ftrace/core
      ftrace: Test for NULL iter->tr in regex for stack_trace_filter changes

----
 kernel/trace/ftrace.c          |  6 ++----
 kernel/trace/trace.c           |  3 +++
 kernel/trace/trace_functions.c | 12 ++++++++++++
 kernel/trace/trace_stack.c     |  6 ++++--
 4 files changed, 21 insertions(+), 6 deletions(-)

[toc] | [next] | [standalone]

#1682398 — [for-next][PATCH 3/3] ftrace: Test for NULL iter->tr in regex for stack_trace_filter changes

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

As writing into stack_trace_filter, the iter-tr is not set and is NULL.
Check if it is NULL before dereferencing it in ftrace_regex_release().

Fixes: 8c08f0d5c6fb ("ftrace: Have cached module filters be an active filter")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 kernel/trace/ftrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f8c18f15b190..2953d558bbee 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5043,7 +5043,7 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
 
 		if (filter_hash) {
 			orig_hash = &iter->ops->func_hash->filter_hash;
-			if (!list_empty(&iter->tr->mod_trace))
+			if (iter->tr && !list_empty(&iter->tr->mod_trace))
 				iter->hash->flags |= FTRACE_HASH_FL_MOD;
 		} else
 			orig_hash = &iter->ops->func_hash->notrace_hash;
-- 
2.10.2

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web