浏览代码

tracing: Fix fields of struct trace_iterator that are zeroed by mistake

tracing_read_pipe zeros all fields bellow "seq". The declaration contains
a comment about that, but it doesn't help.

The first field is "snapshot", it's true when current open file is
snapshot. Looks obvious, that it should not be zeroed.

The second field is "started". It was converted from cpumask_t to
cpumask_var_t (v2.6.28-4983-g4462344), in other words it was
converted from cpumask to pointer on cpumask.

Currently the reference on "started" memory is lost after the first read
from tracing_read_pipe and a proper object will never be freed.

The "started" is never dereferenced for trace_pipe, because trace_pipe
can't have the TRACE_FILE_ANNOTATE options.

Link: http://lkml.kernel.org/r/1375463803-3085183-1-git-send-email-avagin@openvz.org

Cc: stable@vger.kernel.org # 2.6.30
Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Andrew Vagin 12 年之前
父节点
当前提交
ed5467da0e
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 6 4
      include/linux/ftrace_event.h
  2. 1 0
      kernel/trace/trace.c

+ 6 - 4
include/linux/ftrace_event.h

@@ -78,6 +78,11 @@ struct trace_iterator {
 	/* trace_seq for __print_flags() and __print_symbolic() etc. */
 	/* trace_seq for __print_flags() and __print_symbolic() etc. */
 	struct trace_seq	tmp_seq;
 	struct trace_seq	tmp_seq;
 
 
+	cpumask_var_t		started;
+
+	/* it's true when current open file is snapshot */
+	bool			snapshot;
+
 	/* The below is zeroed out in pipe_read */
 	/* The below is zeroed out in pipe_read */
 	struct trace_seq	seq;
 	struct trace_seq	seq;
 	struct trace_entry	*ent;
 	struct trace_entry	*ent;
@@ -90,10 +95,7 @@ struct trace_iterator {
 	loff_t			pos;
 	loff_t			pos;
 	long			idx;
 	long			idx;
 
 
-	cpumask_var_t		started;
-
-	/* it's true when current open file is snapshot */
-	bool			snapshot;
+	/* All new field here will be zeroed out in pipe_read */
 };
 };
 
 
 enum trace_iter_flags {
 enum trace_iter_flags {

+ 1 - 0
kernel/trace/trace.c

@@ -4151,6 +4151,7 @@ waitagain:
 	memset(&iter->seq, 0,
 	memset(&iter->seq, 0,
 	       sizeof(struct trace_iterator) -
 	       sizeof(struct trace_iterator) -
 	       offsetof(struct trace_iterator, seq));
 	       offsetof(struct trace_iterator, seq));
+	cpumask_clear(iter->started);
 	iter->pos = -1;
 	iter->pos = -1;
 
 
 	trace_event_read_lock();
 	trace_event_read_lock();