Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7522c03a authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt
Browse files

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: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 47c18569

kernel/trace/trace_events_hist.c

+3 −3
Original line number Diff line number Diff line
@@ -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)