diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2019-08-13 15:37:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-13 16:06:52 -0700 |
| commit | fcf3a5b62f431ce9feeac73afbe128b7b6395dbc (patch) | |
| tree | dd71cf52ac4dd8a03e3516c37e2e7499f920c52e /mm/kmemleak.c | |
| parent | 5336e52c9e46afa69b7a85a0a091f0e4daa23d6e (diff) | |
| download | linux-stable-fcf3a5b62f431ce9feeac73afbe128b7b6395dbc.tar.gz linux-stable-fcf3a5b62f431ce9feeac73afbe128b7b6395dbc.tar.bz2 linux-stable-fcf3a5b62f431ce9feeac73afbe128b7b6395dbc.zip | |
mm: kmemleak: disable early logging in case of error
If an error occurs during kmemleak_init() (e.g. kmem cache cannot be
created), kmemleak is disabled but kmemleak_early_log remains enabled.
Subsequently, when the .init.text section is freed, the log_early()
function no longer exists. To avoid a page fault in such scenario,
ensure that kmemleak_disable() also disables early logging.
Link: http://lkml.kernel.org/r/20190731152302.42073-1-catalin.marinas@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kmemleak.c')
| -rw-r--r-- | mm/kmemleak.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 6e9e8cca663e..f6e602918dac 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1966,6 +1966,7 @@ static void kmemleak_disable(void) /* stop any memory operation tracing */ kmemleak_enabled = 0; + kmemleak_early_log = 0; /* check whether it is too early for a kernel thread */ if (kmemleak_initialized) @@ -2009,7 +2010,6 @@ void __init kmemleak_init(void) #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF if (!kmemleak_skip_disable) { - kmemleak_early_log = 0; kmemleak_disable(); return; } |