[Devel] [PATCH RHEL7 COMMIT] ms/kasan: depend on CONFIG_SLUB_DEBUG

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-862.20.2.vz7.73.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.20.2.vz7.73.8
------>
commit a1f9a2a7489f29a6e89ed039b5bf95139d3fd817
Author: Jason A. Donenfeld <Jason at zx2c4.com>
Date:   Wed Jun 27 23:26:20 2018 -0700

    ms/kasan: depend on CONFIG_SLUB_DEBUG
    
    KASAN depends on having access to some of the accounting that SLUB_DEBUG
    does; without it, there are immediate crashes [1].  So, the natural
    thing to do is to make KASAN select SLUB_DEBUG.
    
    [1] http://lkml.kernel.org/r/CAHmME9rtoPwxUSnktxzKso14iuVCWT7BE_-_8PAC=pGw1iJnQg@mail.gmail.com
    
    Link: http://lkml.kernel.org/r/20180622154623.25388-1-Jason@zx2c4.com
    Fixes: f9e13c0a5a33 ("slab, slub: skip unnecessary kasan_cache_shutdown()")
    Signed-off-by: Jason A. Donenfeld <Jason at zx2c4.com>
    Acked-by: Michal Hocko <mhocko at suse.com>
    Reviewed-by: Shakeel Butt <shakeelb at google.com>
    Acked-by: Christoph Lameter <cl at linux.com>
    Cc: Shakeel Butt <shakeelb at google.com>
    Cc: David Rientjes <rientjes at google.com>
    Cc: Pekka Enberg <penberg at kernel.org>
    Cc: Joonsoo Kim <iamjoonsoo.kim at lge.com>
    Cc: Andrey Ryabinin <aryabinin at virtuozzo.com>
    Cc: <stable at vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    
    (cherry picked from commit dd275caf4a0d9b219fffe49288b6cc33cd564312)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 lib/Kconfig.kasan | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index da48f37ad788..ef4a37d491b3 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -6,6 +6,7 @@ if HAVE_ARCH_KASAN
 config KASAN
 	bool "KASan: runtime memory debugger"
 	depends on SLUB || (SLAB && !DEBUG_SLAB)
+	select SLUB_DEBUG if SLUB
 	select CONSTRUCTORS
 	select STACKDEPOT
 	help