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

!7665 [sync] PR-7586: powerpc/imc-pmu: Add a null pointer check in update_events_in_group() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7586 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MNNKCJ2KH5FANLAD2EDANWXTOGXBJKSB/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q9J4 
 
Link:https://gitee.com/openeuler/kernel/pulls/7665

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7d4a320c 8ac21877

arch/powerpc/perf/imc-pmu.c

+6 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 
	attr_group->attrs = attrs;

	do {

		ev_val_str = kasprintf(GFP_KERNEL, "event=0x%x", pmu->events[i].value);

		if (!ev_val_str)

			continue;

		dev_str = device_str_attr_create(pmu->events[i].name, ev_val_str);

		if (!dev_str)

			continue;
@@ -299,6 +301,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 
		attrs[j++] = dev_str;

		if (pmu->events[i].scale) {

			ev_scale_str = kasprintf(GFP_KERNEL, "%s.scale", pmu->events[i].name);

			if (!ev_scale_str)

				continue;

			dev_str = device_str_attr_create(ev_scale_str, pmu->events[i].scale);

			if (!dev_str)

				continue;
@@ -308,6 +312,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu) 


		if (pmu->events[i].unit) {

			ev_unit_str = kasprintf(GFP_KERNEL, "%s.unit", pmu->events[i].name);

			if (!ev_unit_str)

				continue;

			dev_str = device_str_attr_create(ev_unit_str, pmu->events[i].unit);

			if (!dev_str)

				continue;