Commit e7cb55b946a2182c347047dc903c6ed0daef100c
1 parent
012abeea66
Exists in
master
and in
7 other branches
kmemleak: Do not use off-slab management with SLAB_NOLEAKTRACE
With the slab allocator, if off-slab management is enabled for the kmem_caches used by kmemleak, it leads to recursive calls into kmemleak_alloc(). Off-slab management can be triggered by other config options increasing the slab size, e.g. DEBUG_PAGEALLOC. Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
mm/slab.c
| ... | ... | @@ -2261,9 +2261,11 @@ |
| 2261 | 2261 | /* |
| 2262 | 2262 | * Determine if the slab management is 'on' or 'off' slab. |
| 2263 | 2263 | * (bootstrapping cannot cope with offslab caches so don't do |
| 2264 | - * it too early on.) | |
| 2264 | + * it too early on. Always use on-slab management when | |
| 2265 | + * SLAB_NOLEAKTRACE to avoid recursive calls into kmemleak) | |
| 2265 | 2266 | */ |
| 2266 | - if ((size >= (PAGE_SIZE >> 3)) && !slab_early_init) | |
| 2267 | + if ((size >= (PAGE_SIZE >> 3)) && !slab_early_init && | |
| 2268 | + !(flags & SLAB_NOLEAKTRACE)) | |
| 2267 | 2269 | /* |
| 2268 | 2270 | * Size is large, assume best to place the slab management obj |
| 2269 | 2271 | * off-slab (should allow better packing of objs). |