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

!13951 Fix UAF in __update_blocked_fair 

Merge Pull Request from: @ci-robot 
 
PR sync from: liukai <liukai284@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BUL3PXBFZGZRQSTEEHCZAKJF4VNC4XNX/ 
 
https://gitee.com/openeuler/kernel/issues/IB7B5F 
 
Link:https://gitee.com/openeuler/kernel/pulls/13951

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 75f57027 4382392c

kernel/sched/fair.c

+5 −4
Original line number Diff line number Diff line
@@ -14722,10 +14722,6 @@ void free_fair_sched_group(struct task_group *tg) 
	int i;



	for_each_possible_cpu(i) {

#ifdef CONFIG_QOS_SCHED

		if (tg->cfs_rq && tg->cfs_rq[i])

			unthrottle_qos_sched_group(tg->cfs_rq[i]);

#endif

		if (tg->cfs_rq)

			kfree(tg->cfs_rq[i]);

		if (tg->se)
@@ -14812,6 +14808,11 @@ void unregister_fair_sched_group(struct task_group *tg) 
		if (tg->se[cpu])

			remove_entity_load_avg(tg->se[cpu]);



		#ifdef CONFIG_QOS_SCHED

			if (tg->cfs_rq && tg->cfs_rq[cpu])

				unthrottle_qos_sched_group(tg->cfs_rq[cpu]);

		#endif



		/*

		 * Only empty task groups can be destroyed; so we can speculatively

		 * check on_list without danger of it being re-added.