From 4fa40ac6cf36f45797f1575d254e4495651d9472 Mon Sep 17 00:00:00 2001 From: Oliver Pinter Date: Mon, 10 Mar 2008 20:52:10 +0100 Subject: [PATCH] drop slub-fix-possible-NULL-pointer-dereference.patch --- ...lub-fix-possible-NULL-pointer-dereference.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 queue-2.6.22.y/slub-fix-possible-NULL-pointer-dereference.patch diff --git a/queue-2.6.22.y/slub-fix-possible-NULL-pointer-dereference.patch b/queue-2.6.22.y/slub-fix-possible-NULL-pointer-dereference.patch deleted file mode 100644 index d28a711..0000000 --- a/queue-2.6.22.y/slub-fix-possible-NULL-pointer-dereference.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 07ebc960d0bfb49bb5e1287c86bb3b9e4b77b043 Mon Sep 17 00:00:00 2001 -From: Oliver Pinter -Date: Tue, 4 Mar 2008 17:49:04 +0100 -Subject: [PATCH] backport: slub: fix possible NULL pointer dereference - -mainline: 62e5c4b4d6351707346695fd9e151b6cda85cbe1 --->8-- - 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 - Signed-off-by: Christoph Lameter ---8<-- - -Signed-off-by: Oliver Pinter - -diff --git a/mm/slub.c b/mm/slub.c -index 648f2c7..e484f64 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -1,5 +1,5 @@ - /* -- * SLUB: A slab allocator that limits cache line use instead of queuing -+ * SLUB: A slab ellocator that limits cache linenuse instead of queuing - * objects in per cpu and per node lists. - * - * The allocator synchronizes using per slab locks and only -@@ -3073,7 +3073,7 @@ enum slab_stat_type { - #define SO_CPU (1 << SL_CPU) - #define SO_OBJECTS (1 << SL_OBJECTS) - --static unsigned long slab_objects(struct kmem_cache *s, -+static ssize_t long slab_objects(struct kmem_cache *s, - char *buf, unsigned long flags) - { - unsigned long total = 0; -@@ -3084,6 +3084,8 @@ static unsigned long 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) { -- 2.11.4.GIT