tracing: Quiet gcc warning about maybe unused link variable
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Thu, 26 Jul 2018 02:28:56 +0000 (22:28 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 20 Nov 2018 18:05:51 +0000 (18:05 +0000)
commit 2519c1bbe38d7acacc9aacba303ca6f97482ed53 upstream.

Commit 57ea2a34adf4 ("tracing/kprobes: Fix trace_probe flags on
enable_trace_kprobe() failure") added an if statement that depends on another
if statement that gcc doesn't see will initialize the "link" variable and
gives the warning:

 "warning: 'link' may be used uninitialized in this function"

It is really a false positive, but to quiet the warning, and also to make
sure that it never actually is used uninitialized, initialize the "link"
variable to NULL and add an if (!WARN_ON_ONCE(!link)) where the compiler
thinks it could be used uninitialized.

Fixes: 57ea2a34adf4 ("tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
kernel/trace/trace_kprobe.c

index 27749248f457f6e89ef488206f5ab2fd50976f87..713abc5c1894f7e98d65205ba5953a08bd6cf2f3 100644 (file)
@@ -361,7 +361,7 @@ static struct trace_kprobe *find_trace_kprobe(const char *event,
 static int
 enable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file)
 {
-       struct event_file_link *link;
+       struct event_file_link *link = NULL;
        int ret = 0;
 
        if (file) {
@@ -387,7 +387,9 @@ enable_trace_kprobe(struct trace_kprobe *tk, struct ftrace_event_file *file)
 
        if (ret) {
                if (file) {
-                       list_del_rcu(&link->list);
+                       /* Notice the if is true on not WARN() */
+                       if (!WARN_ON_ONCE(!link))
+                               list_del_rcu(&link->list);
                        kfree(link);
                        tk->tp.flags &= ~TP_FLAG_TRACE;
                } else {