Commit 31be8309 authored Nov 16, 2006 by OGAWA Hirofumi Committed by Linus Torvalds Nov 16, 2006

[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>

parent da63fc7c

mm/vmalloc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -181,14 +181,13 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
		}
		addr = ALIGN(start, align);
		size = PAGE_ALIGN(size);
		if (unlikely(!size))
		return NULL;

		area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
		if (unlikely(!area))
		return NULL;

		if (unlikely(!size))
		return NULL;

		/*
		* We always allocate a guard page.
		*/