summaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
authorJ. R. Okajima <hooanon05@yahoo.co.jp>2009-12-02 16:55:50 +0900
committerPekka Enberg <penberg@cs.helsinki.fi>2009-12-06 10:24:03 +0200
commitddbf2e8366f2a7fa3419be418cfd83a914d2527f (patch)
treeeb5780e7a91ccae58f7754e13627804f5f893320 /mm/slab.c
parentf3d8b53a3abbfd0b74fa5dfaa690870d9619fad9 (diff)
downloadlinux-ddbf2e8366f2a7fa3419be418cfd83a914d2527f.tar.gz
linux-ddbf2e8366f2a7fa3419be418cfd83a914d2527f.tar.bz2
linux-ddbf2e8366f2a7fa3419be418cfd83a914d2527f.zip
slab, kmemleak: pass the correct pointer to kmemleak_erase()
In ____cache_alloc(), the variable 'ac' may be changed after cache_alloc_refill() and the following kmemleak_erase() may get an incorrect pointer. Update 'ac' after cache_alloc_refill() unconditionally. See the following URL for the discussion of this patch: http://marc.info/?l=linux-kernel&m=125873373124187&w=2 Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 4e61449d7946..66e90477a4bb 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3103,6 +3103,11 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
} else {
STATS_INC_ALLOCMISS(cachep);
objp = cache_alloc_refill(cachep, flags);
+ /*
+ * the 'ac' may be updated by cache_alloc_refill(),
+ * and kmemleak_erase() requires its correct value.
+ */
+ ac = cpu_cache_get(cachep);
}
/*
* To avoid a false negative, if an object that is in one of the