aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmmar Faizi <[email protected]>2022-04-18 01:56:29 +0700
committerSteven Rostedt (Google) <[email protected]>2022-04-26 17:58:52 -0400
commit97a5d2e5e35f119b6d7a37c7538773ae7af82dd5 (patch)
treec64b9527c68254a913e5d81bfaca7310ecd86ecf
parentcb1c45fb68b8a4285ccf750842b1136f26cfe267 (diff)
tracing: Return -EINVAL if WARN_ON(!glob) triggered in event_hist_trigger_parse()
If `WARN_ON(!glob)` is ever triggered, we will still continue executing the next lines. This will trigger the more serious problem, a NULL pointer dereference bug. Just return -EINVAL if @glob is NULL. Link: https://lkml.kernel.org/r/[email protected] Cc: Ingo Molnar <[email protected]> Cc: GNU/Weeb Mailing List <[email protected]> Signed-off-by: Ammar Faizi <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
-rw-r--r--kernel/trace/trace_events_hist.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 998dfe2162fc..80c25be23c45 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -6214,7 +6214,8 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops,
lockdep_assert_held(&event_mutex);
- WARN_ON(!glob);
+ if (WARN_ON(!glob))
+ return -EINVAL;
if (strlen(glob)) {
hist_err_clear();