Skip to content

Commit 7522c03

Browse files
tzanussirostedt
authored andcommitted
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 <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 47c1856 commit 7522c03

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/trace/trace_events_hist.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,16 +1441,16 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops,
14411441
goto out;
14421442
}
14431443

1444+
if (hist_data->attrs->pause)
1445+
data->paused = true;
1446+
14441447
if (named_data) {
14451448
destroy_hist_data(data->private_data);
14461449
data->private_data = named_data->private_data;
14471450
set_named_trigger_data(data, named_data);
14481451
data->ops = &event_hist_trigger_named_ops;
14491452
}
14501453

1451-
if (hist_data->attrs->pause)
1452-
data->paused = true;
1453-
14541454
if (data->ops->init) {
14551455
ret = data->ops->init(data->ops, data);
14561456
if (ret < 0)

0 commit comments

Comments
 (0)