diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2018-03-15 08:44:24 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-04-30 12:09:56 -0400 |
commit | d66a270be3310d7aa132fec0cea77d3d32a0ff75 (patch) | |
tree | f429edf70b65f7e4b42971b6a67ef919fbfc1a5c /kernel/tracepoint.c | |
parent | dcf234577cd31fa16874e828b90659166ad6b80d (diff) |
tracepoint: Do not warn on ENOMEM
Tracepoint should only warn when a kernel API user does not respect the
required preconditions (e.g. same tracepoint enabled twice, or called
to remove a tracepoint that does not exist).
Silence warning in out-of-memory conditions, given that the error is
returned to the caller.
This ensures that out-of-memory error-injection testing does not trigger
warnings in tracepoint.c, which were seen by syzbot.
Link: https://lkml.kernel.org/r/001a114465e241a8720567419a72@google.com
Link: https://lkml.kernel.org/r/001a1140e0de15fc910567464190@google.com
Link: http://lkml.kernel.org/r/20180315124424.32319-1-mathieu.desnoyers@efficios.com
CC: Peter Zijlstra <peterz@infradead.org>
CC: Jiri Olsa <jolsa@redhat.com>
CC: Arnaldo Carvalho de Melo <acme@kernel.org>
CC: Alexander Shishkin <alexander.shishkin@linux.intel.com>
CC: Namhyung Kim <namhyung@kernel.org>
CC: stable@vger.kernel.org
Fixes: de7b2973903c6 ("tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints")
Reported-by: syzbot+9c0d616860575a73166a@syzkaller.appspotmail.com
Reported-by: syzbot+4e9ae7fa46233396f64d@syzkaller.appspotmail.com
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/tracepoint.c')
-rw-r--r-- | kernel/tracepoint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 671b13457387..1e37da2e0c25 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
@@ -207,7 +207,7 @@ static int tracepoint_add_func(struct tracepoint *tp, | |||
207 | lockdep_is_held(&tracepoints_mutex)); | 207 | lockdep_is_held(&tracepoints_mutex)); |
208 | old = func_add(&tp_funcs, func, prio); | 208 | old = func_add(&tp_funcs, func, prio); |
209 | if (IS_ERR(old)) { | 209 | if (IS_ERR(old)) { |
210 | WARN_ON_ONCE(1); | 210 | WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); |
211 | return PTR_ERR(old); | 211 | return PTR_ERR(old); |
212 | } | 212 | } |
213 | 213 | ||
@@ -239,7 +239,7 @@ static int tracepoint_remove_func(struct tracepoint *tp, | |||
239 | lockdep_is_held(&tracepoints_mutex)); | 239 | lockdep_is_held(&tracepoints_mutex)); |
240 | old = func_remove(&tp_funcs, func); | 240 | old = func_remove(&tp_funcs, func); |
241 | if (IS_ERR(old)) { | 241 | if (IS_ERR(old)) { |
242 | WARN_ON_ONCE(1); | 242 | WARN_ON_ONCE(PTR_ERR(old) != -ENOMEM); |
243 | return PTR_ERR(old); | 243 | return PTR_ERR(old); |
244 | } | 244 | } |
245 | 245 | ||