]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Slab: Fix memory leak in fallback_alloc()
authorChristoph Lameter <clameter@sgi.com>
Sat, 21 Jun 2008 23:46:35 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Jun 2008 23:51:02 +0000 (16:51 -0700)
The zonelist patches caused the loop that checks for available
objects in permitted zones to not terminate immediately. One object
per zone per allocation may be allocated and then abandoned.

Break the loop when we have successfully allocated one object.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/slab.c

index 06236e4ddc1b99686d64683865ca648ed2f79864..046607f05f3eb16414538201836c6e605135b0e8 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3263,9 +3263,12 @@ retry:
 
                if (cpuset_zone_allowed_hardwall(zone, flags) &&
                        cache->nodelists[nid] &&
-                       cache->nodelists[nid]->free_objects)
+                       cache->nodelists[nid]->free_objects) {
                                obj = ____cache_alloc_node(cache,
                                        flags | GFP_THISNODE, nid);
+                               if (obj)
+                                       break;
+               }
        }
 
        if (!obj) {