Re: [PATCH v3 11/39] kasan: don't duplicate config dependencies
From: elver
Date: Thu Oct 01 2020 - 13:39:56 EST
On Fri, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov 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>
But see comment below:
> ---
> Change-Id: I77e475802e8f1750b9154fe4a6e6da4456054fcd
> ---
> lib/Kconfig.kasan | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
> index e1d55331b618..b4cf6c519d71 100644
> --- a/lib/Kconfig.kasan
> +++ b/lib/Kconfig.kasan
> @@ -24,6 +24,9 @@ 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 SLUB_DEBUG if SLUB
> + select CONSTRUCTORS
> + select STACKDEPOT
In the later patch your move 'select SLUB_DEBUG' back to where they were
here it seems. The end result is the same, so I leave it to you if you
want to change it.
> help
> Enables KASAN (KernelAddressSANitizer) - runtime memory debugger,
> designed to find out-of-bounds accesses and use-after-free bugs.
> @@ -46,10 +49,6 @@ 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,6 @@ 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.28.0.681.g6f77f65b4e-goog
>