Эх сурвалжийг харах

[PATCH] Fix strange size check in __get_vm_area_node()

Recently, __get_vm_area_node() was changed like following

 	if (unlikely(!area))
 		return NULL;

-	if (unlikely(!size)) {
-		kfree (area);
+	if (unlikely(!size))
 		return NULL;
-	}

It is leaking `area', also original code seems strange already.
Probably, we wanted to do this patch.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OGAWA Hirofumi 18 жил өмнө
parent
commit
31be830953
1 өөрчлөгдсөн 2 нэмэгдсэн , 3 устгасан
  1. 2 3
      mm/vmalloc.c

+ 2 - 3
mm/vmalloc.c

@@ -181,14 +181,13 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
 	}
 	}
 	addr = ALIGN(start, align);
 	addr = ALIGN(start, align);
 	size = PAGE_ALIGN(size);
 	size = PAGE_ALIGN(size);
+	if (unlikely(!size))
+		return NULL;
 
 
 	area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
 	area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
 	if (unlikely(!area))
 	if (unlikely(!area))
 		return NULL;
 		return NULL;
 
 
-	if (unlikely(!size))
-		return NULL;
-
 	/*
 	/*
 	 * We always allocate a guard page.
 	 * We always allocate a guard page.
 	 */
 	 */