diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2009-09-22 13:52:20 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-22 10:28:55 +0200 |
| commit | 4ba7978e98a3ff92cebfb0f31a02c309e3ffa1fe (patch) | |
| tree | 47d8b3b0927a7413fabcc634023b45350f344d89 /kernel/trace/trace_events.c | |
| parent | 3c235a337e205da0f614e456be72881483dcde6e (diff) | |
| download | blackbird-op-linux-4ba7978e98a3ff92cebfb0f31a02c309e3ffa1fe.tar.gz blackbird-op-linux-4ba7978e98a3ff92cebfb0f31a02c309e3ffa1fe.zip | |
tracing: Check the return value of trace_get_user()
Return immediately if trace_get_user() returned failure.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <4AB86614.7020803@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 6f03c8a1105e..d128f65778e6 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -232,10 +232,9 @@ ftrace_event_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { struct trace_parser parser; - size_t read = 0; - ssize_t ret; + ssize_t read, ret; - if (!cnt || cnt < 0) + if (!cnt) return 0; ret = tracing_update_buffers(); @@ -247,7 +246,7 @@ ftrace_event_write(struct file *file, const char __user *ubuf, read = trace_get_user(&parser, ubuf, cnt, ppos); - if (trace_parser_loaded((&parser))) { + if (read >= 0 && trace_parser_loaded((&parser))) { int set = 1; if (*parser.buffer == '!') |
