aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Vagin <avagin@openvz.org>2013-08-02 21:16:43 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 22:55:17 -0700
commitc63eea737793f3562cc62d1395b6b1d325804d27 (patch)
tree84cc3a895e1de0e700c40567894fe3d6f1f5b82b /include
parenta9d8aaedf15cc981df0aebda88b113eeee9c5cab (diff)
downloadkernel_samsung_smdk4412-c63eea737793f3562cc62d1395b6b1d325804d27.zip
kernel_samsung_smdk4412-c63eea737793f3562cc62d1395b6b1d325804d27.tar.gz
kernel_samsung_smdk4412-c63eea737793f3562cc62d1395b6b1d325804d27.tar.bz2
tracing: Fix fields of struct trace_iterator that are zeroed by mistake
commit ed5467da0e369e65b247b99eb6403cb79172bcda upstream. 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 Signed-off-by: Andrew Vagin <avagin@openvz.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace_event.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 59d3ef1..217b3c2 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -71,6 +71,8 @@ struct trace_iterator {
/* trace_seq for __print_flags() and __print_symbolic() etc. */
struct trace_seq tmp_seq;
+ cpumask_var_t started;
+
/* The below is zeroed out in pipe_read */
struct trace_seq seq;
struct trace_entry *ent;
@@ -82,7 +84,7 @@ struct trace_iterator {
loff_t pos;
long idx;
- cpumask_var_t started;
+ /* All new field here will be zeroed out in pipe_read */
};