---

yaml --- r: 320755 b: refs/heads/master c: aa91c4d h: refs/heads/master i: 320753: 3dde3a5 320751: faf6bc0 v: v3
git-mirror · Aug 1, 2012 · a0eb956 · a0eb956
1 parent 953489a
commit a0eb956
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ca922f0a19145f2dcc99d84fe656fa55b52c2e
+refs/heads/master: aa91c4d898c062804f4d0a5da6d8ab013cd0e868
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
@@ -904,6 +904,14 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
 
 	BUG_ON(size & ~PAGE_MASK);
 	BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
+	if (WARN_ON(size == 0)) {
+		/*
+		 * Allocating 0 bytes isn't what caller wants since
+		 * get_order(0) returns funny result. Just warn and terminate
+		 * early.
+		 */
+		return NULL;
+	}
 	order = get_order(size);
 
 again: