[PATCH] kasan: add missing Kconfig dependencies

[PATCH] kasan: add missing Kconfig dependencies

[Arnd Bergmann]

Building with CONFIG_KASAN=y when neither KASAN_GENERIC nor KASAN_SW_TAGS
can be selected leads to a build error:

arch/arm64/mm/kasan_init.c: In function 'kasan_pte_populate':
arch/arm64/mm/kasan_init.c:106:28: error: 'KASAN_SHADOW_INIT' undeclared (first use in this function); did you mean 'KASAN_SHADOW_END'?

We should really only allow enabling KASAN when all its dependencies
are met as it was before the introduction of CONFIG_KASAN_SW_TAGS.

Fixes: b8440cc16515 ("kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 lib/Kconfig.kasan | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index b5d0cbfce4a1..83286bca2f70 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -15,6 +15,8 @@ if HAVE_ARCH_KASAN
 
 config KASAN
 	bool "KASAN: runtime memory debugger"
+	depends on CC_HAS_KASAN_GENERIC || CC_HAS_KASAN_SW_TAGS
+	depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB)
 	help
 	  Enables KASAN (KernelAddressSANitizer) - runtime memory debugger,
 	  designed to find out-of-bounds accesses and use-after-free bugs.
-- 
2.20.0

Re: [PATCH] kasan: add missing Kconfig dependencies

[Andrey Konovalov]

On Mon, Dec 10, 2018 at 9:59 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> Building with CONFIG_KASAN=y when neither KASAN_GENERIC nor KASAN_SW_TAGS
> can be selected leads to a build error:
>
> arch/arm64/mm/kasan_init.c: In function 'kasan_pte_populate':
> arch/arm64/mm/kasan_init.c:106:28: error: 'KASAN_SHADOW_INIT' undeclared (first use in this function); did you mean 'KASAN_SHADOW_END'?
>
> We should really only allow enabling KASAN when all its dependencies
> are met as it was before the introduction of CONFIG_KASAN_SW_TAGS.
>
> Fixes: b8440cc16515 ("kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Hi Arnd,

Is this a patch against linux-next? The issue has been addressed by
v13 of the patchset, which is now in the mm tree and should end up in
the linux-next soon AFAIU.

Thanks!

> ---
>  lib/Kconfig.kasan | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
> index b5d0cbfce4a1..83286bca2f70 100644
> --- a/lib/Kconfig.kasan
> +++ b/lib/Kconfig.kasan
> @@ -15,6 +15,8 @@ if HAVE_ARCH_KASAN
>
>  config KASAN
>         bool "KASAN: runtime memory debugger"
> +       depends on CC_HAS_KASAN_GENERIC || CC_HAS_KASAN_SW_TAGS
> +       depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB)
>         help
>           Enables KASAN (KernelAddressSANitizer) - runtime memory debugger,
>           designed to find out-of-bounds accesses and use-after-free bugs.
> --
> 2.20.0
>

Re: [PATCH] kasan: add missing Kconfig dependencies

[Arnd Bergmann]

On Mon, Dec 10, 2018 at 10:15 PM Andrey Konovalov <andreyknvl@google.com> wrote:
>
> On Mon, Dec 10, 2018 at 9:59 PM Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > Building with CONFIG_KASAN=y when neither KASAN_GENERIC nor KASAN_SW_TAGS
> > can be selected leads to a build error:
> >
> > arch/arm64/mm/kasan_init.c: In function 'kasan_pte_populate':
> > arch/arm64/mm/kasan_init.c:106:28: error: 'KASAN_SHADOW_INIT' undeclared (first use in this function); did you mean 'KASAN_SHADOW_END'?
> >
> > We should really only allow enabling KASAN when all its dependencies
> > are met as it was before the introduction of CONFIG_KASAN_SW_TAGS.
> >
> > Fixes: b8440cc16515 ("kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Hi Arnd,
>
> Is this a patch against linux-next? The issue has been addressed by
> v13 of the patchset, which is now in the mm tree and should end up in
> the linux-next soon AFAIU.

Yes, I tested on today's linux-next. I'll drop the patch tomorrow then from
my test tree.

       Arnd

Re: [PATCH] kasan: add missing Kconfig dependencies

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

Hi Andrey,

On Mon, 10 Dec 2018 22:14:57 +0100 Andrey Konovalov <andreyknvl@google.com> wrote:
>
> Is this a patch against linux-next? The issue has been addressed by
> v13 of the patchset, which is now in the mm tree and should end up in
> the linux-next soon AFAIU.

It may be in the mmots series, but it is not (yet) in the mmotm series
and so won't appear in linux-next today (unless Andrew updates mmotm
soon).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]