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

!13296 sched/numa: Fix the potential null pointer dereference in task_numa_work() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liukai <liukai284@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7CL2QJ5336N3H6JCGQYFBDKJNADSII2C/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB37AS 
 
Link:https://gitee.com/openeuler/kernel/pulls/13296

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents cd76a755 fc46500c

kernel/sched/fair.c

+2 −2
Original line number Diff line number Diff line
@@ -3413,7 +3413,7 @@ static void task_numa_work(struct callback_head *work) 
		vma = vma_next(&vmi);

	}



	do {

	for (; vma; vma = vma_next(&vmi)) {

		if (!vma_migratable(vma) || !vma_policy_mof(vma) ||

			is_vm_hugetlb_page(vma) || (vma->vm_flags & VM_MIXEDMAP)) {

			continue;
@@ -3499,7 +3499,7 @@ static void task_numa_work(struct callback_head *work) 


			cond_resched();

		} while (end != vma->vm_end);

	} for_each_vma(vmi, vma);

	}



out:

	/*