slob: Fix to return wrong pointer

Although slob_alloc return NULL, __kmalloc_node returns NULL + align. Because align always can be changed, it is very hard for debugging problem of no page if it don't return NULL. We have to return NULL in case of no page. [penberg@cs.helsinki.fi: fix formatting as suggested by Matt.] Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: MinChan Kim <minchan.kim@gmail.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

slob: Fix to return wrong pointer
Although slob_alloc return NULL, __kmalloc_node returns NULL + align. Because align always can be changed, it is very hard for debugging problem of no page if it don't return NULL. We have to return NULL in case of no page. [penberg@cs.helsinki.fi: fix formatting as suggested by Matt.] Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: MinChan Kim <minchan.kim@gmail.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
MinChan Kim · Pekka Enberg
1 parent f26a398891
Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff
mm/slob.c
@@ -469,8 +469,9 @@
 			return ZERO_SIZE_PTR;
  
 		m = slob_alloc(size + align, gfp, align, node);
-		if (m)
-			*m = size;
+		if (!m)
+			return NULL;
+		*m = size;
 		return (void *)m + align;
 	} else {
 		void *ret;
...	...	@@ -469,8 +469,9 @@
469	469	return ZERO_SIZE_PTR;
470	470
471	471	m = slob_alloc(size + align, gfp, align, node);
472		- if (m)
473		- *m = size;
	472	+ if (!m)
	473	+ return NULL;
	474	+ *m = size;
474	475	return (void *)m + align;
475	476	} else {
476	477	void *ret;