mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] mm: mmap: Check all failures before set values
@ 2015-08-23 17:21 Chen Gang
  0 siblings, 0 replies; 8+ messages in thread
From: Chen Gang @ 2015-08-23 17:21 UTC (permalink / raw)
  To: kernel mailing list, linux-ia64

When failure occurs and return, vma->vm_pgoff is already set, which is
not a good idea.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 mm/mmap.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 8e0366e..b5a6f09 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2878,6 +2878,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
 	struct vm_area_struct *prev;
 	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
 	 * until its first write fault, when page's anon_vma and index
@@ -2894,12 +2901,6 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
 		BUG_ON(vma->anon_vma);
 		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);
 	return 0;
-- 
1.9.3

 		 	   		  

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-08-25 21:33 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1440349179-18304-1-git-send-email-gang.chen.5i5j@qq.com>
2015-08-24 11:32 ` [PATCH] mm: mmap: Check all failures before set values Michal Hocko
     [not found]   ` <55DB1D94.3050404@hotmail.com>
2015-08-24 13:34     ` Chen Gang
2015-08-24 13:57       ` Michal Hocko
     [not found]         ` <55DB9278.2020603@qq.com>
2015-08-25 11:35           ` Michal Hocko
     [not found]             ` <55DCDF7E.6080402@hotmail.com>
2015-08-25 21:33               ` Chen Gang
2015-08-24 21:25   ` Andrew Morton
     [not found]     ` <55DB93B2.9010705@hotmail.com>
2015-08-24 21:58       ` Chen Gang
2015-08-23 17:21 Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®