Commit 33154fb3 authored by Hui Tang's avatar Hui Tang Committed by Yipeng Zou
Browse files

sched: fix dereference NULL pointers 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7EA1X


CVE: NA

-------------------------------

tg->auto_affinity is NULL if init_auto_affinity() failed.
So add checking for tg->auto_affinity before derefrence.

Fixes: 713cfd26 ("sched: Introduce smart grid scheduling strategy for cfs")
Signed-off-by: default avatarHui Tang <tanghui20@huawei.com>
Reviewed-by: default avatarZhang Qiao <zhangqiao22@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarYipeng Zou <zouyipeng@huawei.com>
parent 529af6bc

kernel/sched/core.c

+27 −3
Original line number Diff line number Diff line
@@ -9531,6 +9531,9 @@ int tg_set_dynamic_affinity_mode(struct task_group *tg, u64 mode) 
{

	struct auto_affinity *auto_affi = tg->auto_affinity;



	if (unlikely(!auto_affi))

		return -EPERM;



	/* auto mode*/

	if (mode == 1) {

		start_auto_affinity(auto_affi);
@@ -9548,6 +9551,9 @@ static u64 cpu_affinity_mode_read_u64(struct cgroup_subsys_state *css, 
{

	struct task_group *tg = css_tg(css);



	if (unlikely(!tg->auto_affinity))

		return -EPERM;



	return tg->auto_affinity->mode;

}
@@ -9559,6 +9565,9 @@ static int cpu_affinity_mode_write_u64(struct cgroup_subsys_state *css, 


int tg_set_affinity_period(struct task_group *tg, u64 period_ms)

{

	if (unlikely(!tg->auto_affinity))

		return -EPERM;



	if (period_ms > U64_MAX / NSEC_PER_MSEC)

		return -EINVAL;
@@ -9570,6 +9579,9 @@ int tg_set_affinity_period(struct task_group *tg, u64 period_ms) 


u64 tg_get_affinity_period(struct task_group *tg)

{

	if (unlikely(!tg->auto_affinity))

		return -EPERM;



	return ktime_to_ms(tg->auto_affinity->period);

}
@@ -9590,9 +9602,14 @@ static int cpu_affinity_domain_mask_write_u64(struct cgroup_subsys_state *css, 
					      u64 mask)

{

	struct task_group *tg = css_tg(css);

	struct affinity_domain *ad = &tg->auto_affinity->ad;

	u16 full = (1 << ad->dcount) - 1;

	struct affinity_domain *ad;

	u16 full;



	if (unlikely(!tg->auto_affinity))

		return -EPERM;



	ad = &tg->auto_affinity->ad;

	full = (1 << ad->dcount) - 1;

	if (mask > full)

		return -EINVAL;
@@ -9607,6 +9624,9 @@ static u64 cpu_affinity_domain_mask_read_u64(struct cgroup_subsys_state *css, 
{

	struct task_group *tg = css_tg(css);



	if (unlikely(!tg->auto_affinity))

		return -EPERM;



	return tg->auto_affinity->ad.domain_mask;

}
@@ -9614,9 +9634,13 @@ static int cpu_affinity_stat_show(struct seq_file *sf, void *v) 
{

	struct task_group *tg = css_tg(seq_css(sf));

	struct auto_affinity *auto_affi = tg->auto_affinity;

	struct affinity_domain *ad = &auto_affi->ad;

	struct affinity_domain *ad;

	int i;



	if (unlikely(!auto_affi))

		return -EPERM;



	ad = &auto_affi->ad;

	seq_printf(sf, "period_active %d\n", auto_affi->period_active);

	seq_printf(sf, "dcount %d\n", ad->dcount);

	seq_printf(sf, "domain_mask 0x%x\n", ad->domain_mask);

kernel/sched/fair.c

+3 −0
Original line number Diff line number Diff line
@@ -6225,6 +6225,9 @@ static void destroy_auto_affinity(struct task_group *tg) 
{

	struct auto_affinity *auto_affi = tg->auto_affinity;



	if (unlikely(!auto_affi))

		return;



	if (auto_affi->period_active)

		smart_grid_usage_dec();