On Tue, Nov 10, 2020 at 11:11 PM Andrey Konovalov <andreyknvl@xxxxxxxxxx> wrote: > > Both KASAN_GENERIC and KASAN_SW_TAGS have common dependencies, move > those to KASAN. > > Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> > Reviewed-by: Marco Elver <elver@xxxxxxxxxx> Reviewed-by: Alexander Potapenko <glider@xxxxxxxxxx> > --- > Change-Id: I77e475802e8f1750b9154fe4a6e6da4456054fcd > --- > lib/Kconfig.kasan | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index 8f0742a0f23e..ec59a0e26d09 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -24,6 +24,8 @@ menuconfig KASAN > (HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS) > depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) > depends on CC_HAS_WORKING_NOSANITIZE_ADDRESS > + select CONSTRUCTORS > + select STACKDEPOT > help > Enables KASAN (KernelAddressSANitizer) - runtime memory debugger, > designed to find out-of-bounds accesses and use-after-free bugs. > @@ -46,10 +48,7 @@ choice > config KASAN_GENERIC > bool "Generic mode" > depends on HAVE_ARCH_KASAN && CC_HAS_KASAN_GENERIC > - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) > select SLUB_DEBUG if SLUB > - select CONSTRUCTORS > - select STACKDEPOT > help > Enables generic KASAN mode. > > @@ -70,10 +69,7 @@ config KASAN_GENERIC > config KASAN_SW_TAGS > bool "Software tag-based mode" > depends on HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS > - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) > select SLUB_DEBUG if SLUB > - select CONSTRUCTORS > - select STACKDEPOT > help > Enables software tag-based KASAN mode. > > -- > 2.29.2.222.g5d2a92d10f8-goog > -- Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
