X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fslob.c;h=a3ad6671adf179daa38dae11a3963e5323ce0c91;hb=eb4225b2da2b9f3c1ee43efe58ed1415cc1d4c47;hp=6038cbadf796bb165a2b7bf7c9fbe707297f6f53;hpb=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;p=linux-2.6-omap-h63xx.git

diff --git a/mm/slob.c b/mm/slob.c
index 6038cbadf79..a3ad6671adf 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -469,8 +469,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 			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;