diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 04:27:00 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 04:27:00 +0100 |
| commit | 859281ff370977f917ec2195f86a5bfccf1fc6d6 (patch) | |
| tree | ea8b4d21187b5de7b61ca368701c89d3504d5f96 /mm | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus (diff) | |
| download | linux-859281ff370977f917ec2195f86a5bfccf1fc6d6.tar.xz linux-859281ff370977f917ec2195f86a5bfccf1fc6d6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: fix per cpu kmem_cache_cpu array memory leak
kmalloc: return NULL instead of link failure
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 6392ae5cc6b1..bdc9abb08a23 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s, static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu) { if (c < per_cpu(kmem_cache_cpu, cpu) || - c > per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { + c >= per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) { kfree(c); return; } |