From: Li Zefan <lizf@cn.fujitsu.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/5] tracing/events: don't increment @pos in s_start()
Date: Fri, 19 Jun 2009 14:45:41 +0800 [thread overview]
Message-ID: <4A3B3415.5060304@cn.fujitsu.com> (raw)
In-Reply-To: <4A3B3372.4040608@cn.fujitsu.com>
While testing syscall tracepoints posted by Jason, I found 3 entries
were missing when reading available_events. The output size of
available_events is < 4 pages, which means we lost 1 item per page.
The cause is, it's wrong to increment @pos in s_start().
Actually there's another bug here -- reading avaiable_events/set_events
can race with module unload:
# cat available_events |
s_start() |
s_stop() |
| # rmmod foo.ko
s_start() |
call = list_entry(m->private) |
@call might be freed and accessing it will lead to crash.
[ Impact fix missing entries when reading available_events/set_events ]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_events.c | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index aa341ff..4ab596e 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -300,10 +300,18 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
static void *t_start(struct seq_file *m, loff_t *pos)
{
+ struct ftrace_event_call *call = NULL;
+ loff_t l;
+
mutex_lock(&event_mutex);
- if (*pos == 0)
- m->private = ftrace_events.next;
- return t_next(m, NULL, pos);
+
+ m->private = ftrace_events.next;
+ for (l = 0; l <= *pos; ) {
+ call = t_next(m, NULL, &l);
+ if (!call)
+ break;
+ }
+ return call;
}
static void *
@@ -332,10 +340,18 @@ s_next(struct seq_file *m, void *v, loff_t *pos)
static void *s_start(struct seq_file *m, loff_t *pos)
{
+ struct ftrace_event_call *call = NULL;
+ loff_t l;
+
mutex_lock(&event_mutex);
- if (*pos == 0)
- m->private = ftrace_events.next;
- return s_next(m, NULL, pos);
+
+ m->private = ftrace_events.next;
+ for (l = 0; l <= *pos; ) {
+ call = s_next(m, NULL, &l);
+ if (!call)
+ break;
+ }
+ return call;
}
static int t_show(struct seq_file *m, void *v)
--
1.5.4.rc3
next prev parent reply other threads:[~2009-06-19 6:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-19 6:42 [PATCH 0/5] tracing: seqfile fixes Li Zefan
2009-06-19 6:45 ` Li Zefan [this message]
2009-06-19 6:46 ` [PATCH 2/5] tracing_bprintk: don't increment @pos in t_start() Li Zefan
2009-06-19 9:39 ` Wang Liming
2009-06-22 0:38 ` Li Zefan
2009-06-22 2:08 ` Wang Liming
2009-06-22 3:01 ` Li Zefan
2009-06-19 6:46 ` [PATCH 3/5] trace_stat: don't increment @pos in stat_seq_start() Li Zefan
2009-06-19 6:47 ` [PATCH 4/5] ftrace: don't increment @pos in g_start() Li Zefan
2009-06-19 8:59 ` [PATCH] " Liming Wang
2009-06-19 9:45 ` Li Zefan
2009-06-22 0:45 ` Li Zefan
2009-06-22 2:42 ` Wang Liming
2009-06-22 3:15 ` Li Zefan
2009-06-22 3:08 ` Wang Liming
2009-06-19 6:48 ` [PATCH 5/5] tracing: reset iterator in t_start() Li Zefan
2009-06-23 6:48 ` Wang Liming
2009-06-23 7:19 ` Li Zefan
2009-06-23 7:19 ` Wang Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A3B3415.5060304@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox