aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>2006-11-16 01:19:29 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 11:43:38 -0800
commit31be8309532a6743f301cb2e83bd12ca07988b09 (patch)
tree9f84911bae39b11247f2e62ed9d7d451ef4b0a2f /mm
parentda63fc7ce63b43426dc3c69c05e28de2872c159a (diff)
downloadkernel_samsung_smdk4412-31be8309532a6743f301cb2e83bd12ca07988b09.zip
kernel_samsung_smdk4412-31be8309532a6743f301cb2e83bd12ca07988b09.tar.gz
kernel_samsung_smdk4412-31be8309532a6743f301cb2e83bd12ca07988b09.tar.bz2
[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>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 7dc6aa7..86897ee 100644
--- a/mm/vmalloc.c
+++ b/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);
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.
*/