tracing/kprobes: Fix field creation's bad error handling

When we define the common event fields in kprobe, we invert the error
handling and return immediately in case of success. Then we omit
to define specific kprobes fields (ip and nargs), and specific
kretprobes fields (func, ret_ip, nargs). And we only define them
when we fail to create common fields.

The most visible consequence is that we can't create filter for
k(ret)probes specific fields.

This patch re-invert the success/error handling to fix it.

Reported-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <1260263815-5167-1-git-send-regression-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index bf05fb4..b52d397 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1133,7 +1133,7 @@ static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
        struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
        ret = trace_define_common_fields(event_call);
        struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
        ret = trace_define_common_fields(event_call);

-       if (!ret)
+       if (ret)

                return ret;
 
        DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
                return ret;
 
        DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);


@@ -1151,7 +1151,7 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
        struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
        ret = trace_define_common_fields(event_call);
        struct trace_probe *tp = (struct trace_probe *)event_call->data;
 
        ret = trace_define_common_fields(event_call);

-       if (!ret)
+       if (ret)

                return ret;
 
        DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
                return ret;
 
        DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);