Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0def08e3 authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Linus Torvalds
Browse files

mm/mempolicy.c: check return code of check_range 



Function check_range may return ERR_PTR(...). Check for it.

Signed-off-by: default avatarVasiliy Kulikov <segooon@gmail.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarChristoph Lameter <cl@linux.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 74e3f3c3

mm/mempolicy.c

+4 −1
Original line number Diff line number Diff line
@@ -924,12 +924,15 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, 
	nodemask_t nmask;

	LIST_HEAD(pagelist);

	int err = 0;

	struct vm_area_struct *vma;



	nodes_clear(nmask);

	node_set(source, nmask);



	check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,

	vma = check_range(mm, mm->mmap->vm_start, mm->task_size, &nmask,

			flags | MPOL_MF_DISCONTIG_OK, &pagelist);

	if (IS_ERR(vma))

		return PTR_ERR(vma);



	if (!list_empty(&pagelist)) {

		err = migrate_pages(&pagelist, new_node_page, dest, 0);