diff options
author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2006-11-16 04:19:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 14:43:38 -0500 |
commit | 31be8309532a6743f301cb2e83bd12ca07988b09 (patch) | |
tree | 9f84911bae39b11247f2e62ed9d7d451ef4b0a2f /mm/vmalloc.c | |
parent | da63fc7ce63b43426dc3c69c05e28de2872c159a (diff) |
[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/vmalloc.c')
-rw-r--r-- | mm/vmalloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 7dc6aa745166..86897ee792d6 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 | |||
181 | } | 181 | } |
182 | addr = ALIGN(start, align); | 182 | addr = ALIGN(start, align); |
183 | size = PAGE_ALIGN(size); | 183 | size = PAGE_ALIGN(size); |
184 | if (unlikely(!size)) | ||
185 | return NULL; | ||
184 | 186 | ||
185 | area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node); | 187 | area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node); |
186 | if (unlikely(!area)) | 188 | if (unlikely(!area)) |
187 | return NULL; | 189 | return NULL; |
188 | 190 | ||
189 | if (unlikely(!size)) | ||
190 | return NULL; | ||
191 | |||
192 | /* | 191 | /* |
193 | * We always allocate a guard page. | 192 | * We always allocate a guard page. |
194 | */ | 193 | */ |