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

Commit c9d13f5f authored by Chen Gang's avatar Chen Gang Committed by Linus Torvalds
Browse files

mm/mmap.c:insert_vm_struct(): check for failure before setting values 



There's no point in initializing vma->vm_pgoff if the insertion attempt
will be failing anyway.  Run the checks before performing the
initialization.

Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bde43c6c

mm/mmap.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -2871,6 +2871,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) 
	struct vm_area_struct *prev;

	struct vm_area_struct *prev;

	struct rb_node **rb_link, *rb_parent;

	struct rb_node **rb_link, *rb_parent;





	if (find_vma_links(mm, vma->vm_start, vma->vm_end,

			   &prev, &rb_link, &rb_parent))

		return -ENOMEM;

	if ((vma->vm_flags & VM_ACCOUNT) &&

	     security_vm_enough_memory_mm(mm, vma_pages(vma)))

		return -ENOMEM;



	/*

	/*

	 * The vm_pgoff of a purely anonymous vma should be irrelevant

	 * The vm_pgoff of a purely anonymous vma should be irrelevant

	 * until its first write fault, when page's anon_vma and index

	 * until its first write fault, when page's anon_vma and index
@@ -2887,12 +2894,6 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) 
		BUG_ON(vma->anon_vma);

		BUG_ON(vma->anon_vma);

		vma->vm_pgoff = vma->vm_start >> PAGE_SHIFT;

		vma->vm_pgoff = vma->vm_start >> PAGE_SHIFT;

	}

	}

	if (find_vma_links(mm, vma->vm_start, vma->vm_end,

			   &prev, &rb_link, &rb_parent))

		return -ENOMEM;

	if ((vma->vm_flags & VM_ACCOUNT) &&

	     security_vm_enough_memory_mm(mm, vma_pages(vma)))

		return -ENOMEM;





	vma_link(mm, vma, prev, rb_link, rb_parent);

	vma_link(mm, vma, prev, rb_link, rb_parent);

	return 0;

	return 0;