The patch titled
Fix strange size check in __get_vm_area_node()
has been added to the -mm tree. Its filename is
fix-strange-size-check-in-__get_vm_area_node.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix strange size check in __get_vm_area_node()
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/vmalloc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff -puN mm/vmalloc.c~fix-strange-size-check-in-__get_vm_area_node mm/vmalloc.c
--- a/mm/vmalloc.c~fix-strange-size-check-in-__get_vm_area_node
+++ a/mm/vmalloc.c
@@ -181,14 +181,13 @@ static struct vm_struct *__get_vm_area_n
}
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.
*/
_
Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are
fat-add-fat_getattr.patch
fix-strange-size-check-in-__get_vm_area_node.patch
read_cache_pages-cleanup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
