Unverified Commit cd22f66b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15748 tracing: Fix bad hist from corrupting named_triggers list 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/RPGAHXQ5PCHVK3UCOTEAALRE3LLAPREG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBY44G 
 
Link:https://gitee.com/openeuler/kernel/pulls/15748

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c6172f7a 91323402

kernel/trace/trace_events_hist.c

+15 −15
Original line number Diff line number Diff line
@@ -6660,27 +6660,27 @@ static int event_hist_trigger_parse(struct event_command *cmd_ops, 
	if (existing_hist_update_only(glob, trigger_data, file))

		goto out_free;



	ret = event_trigger_register(cmd_ops, file, glob, trigger_data);

	if (ret < 0)

		goto out_free;



	if (get_named_trigger_data(trigger_data))

		goto enable;

	if (!get_named_trigger_data(trigger_data)) {



		ret = create_actions(hist_data);

		if (ret)

		goto out_unreg;

			goto out_free;



		if (has_hist_vars(hist_data) || hist_data->n_var_refs) {

			ret = save_hist_vars(hist_data);

			if (ret)

			goto out_unreg;

				goto out_free;

		}



		ret = tracing_map_init(hist_data->map);

		if (ret)

		goto out_unreg;

enable:

			goto out_free;

	}



	ret = event_trigger_register(cmd_ops, file, glob, trigger_data);

	if (ret < 0)

		goto out_free;



	ret = hist_trigger_enable(trigger_data, file);

	if (ret)

		goto out_unreg;