diff options
| author | J. R. Okajima <hooanon05@yahoo.co.jp> | 2009-12-02 16:55:49 +0900 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-12-06 10:23:05 +0200 |
| commit | f3d8b53a3abbfd0b74fa5dfaa690870d9619fad9 (patch) | |
| tree | 0077e9af30a2fadf6d02da5420c9d979f80a3ee5 | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| download | kernel-crypto-f3d8b53a3abbfd0b74fa5dfaa690870d9619fad9.tar.gz kernel-crypto-f3d8b53a3abbfd0b74fa5dfaa690870d9619fad9.tar.xz kernel-crypto-f3d8b53a3abbfd0b74fa5dfaa690870d9619fad9.zip | |
slab, kmemleak: stop calling kmemleak_erase() unconditionally
When the gotten object is NULL (probably due to ENOMEM), kmemleak_erase() is
unnecessary here, It just sets NULL to where already is NULL. Add a condition.
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>
| -rw-r--r-- | mm/slab.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c index 7dfa481c96b..4e61449d794 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3109,7 +3109,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) * per-CPU caches is leaked, we need to make sure kmemleak doesn't * treat the array pointers as a reference to the object. */ - kmemleak_erase(&ac->entry[ac->avail]); + if (objp) + kmemleak_erase(&ac->entry[ac->avail]); return objp; } |