diff options
| author |   Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-06-29 19:56:00 -0500 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2016-08-02 15:16:30 -0400 |
| commit | 7522c03ae307e657114ff909aec650304371a134 (patch) | |
| tree | 9c37bee66e0044d8a2c3b0dfc68810bb7942b9b7 /kernel | |
| parent | tracing: Fix use-after-free in hist_unreg_all/hist_enable_unreg_all (diff) | |
| download | linux-dev-7522c03ae307e657114ff909aec650304371a134.tar.xz linux-dev-7522c03ae307e657114ff909aec650304371a134.zip | |
tracing: Fix use-after-free in hist_register_trigger()
This fixes a use-after-free case flagged by KASAN; make sure the test
happens before the potential free in this case.
Link: http://lkml.kernel.org/r/48fd74ab61bebd7dca9714386bb47d7c5ccd6a7b.1467247517.git.tom.zanussi@linux.intel.com
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 19ae135120a3..f3a960ed75a1 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1441,6 +1441,9 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops, goto out; } + if (hist_data->attrs->pause) + data->paused = true; + if (named_data) { destroy_hist_data(data->private_data); data->private_data = named_data->private_data; @@ -1448,9 +1451,6 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops, data->ops = &event_hist_trigger_named_ops; } - if (hist_data->attrs->pause) - data->paused = true; - if (data->ops->init) { ret = data->ops->init(data->ops, data); if (ret < 0) |