From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 2 Mar 2008 20:28:24 +0000 (+0300)
Subject: slub: fix possible NULL pointer dereference
X-Git-Tag: v2.6.25-rc4~107^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62e5c4b4d6351707346695fd9e151b6cda85cbe1;p=linux-2.6-omap-h63xx.git

slub: fix possible NULL pointer dereference

This patch fix possible NULL pointer dereference if kzalloc
failed. To be able to return proper error code the function
return type is changed to ssize_t (according to callees and
sysfs definitions).

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---

diff --git a/mm/slub.c b/mm/slub.c
index ecacacdce9d..0863fd38a5c 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3564,8 +3564,8 @@ enum slab_stat_type {
 #define SO_CPU		(1 << SL_CPU)
 #define SO_OBJECTS	(1 << SL_OBJECTS)
 
-static unsigned long show_slab_objects(struct kmem_cache *s,
-			char *buf, unsigned long flags)
+static ssize_t show_slab_objects(struct kmem_cache *s,
+			    char *buf, unsigned long flags)
 {
 	unsigned long total = 0;
 	int cpu;
@@ -3575,6 +3575,8 @@ static unsigned long show_slab_objects(struct kmem_cache *s,
 	unsigned long *per_cpu;
 
 	nodes = kzalloc(2 * sizeof(unsigned long) * nr_node_ids, GFP_KERNEL);
+	if (!nodes)
+		return -ENOMEM;
 	per_cpu = nodes + nr_node_ids;
 
 	for_each_possible_cpu(cpu) {