From a3d0bfc22a991effe7005bcb593f9f72ff866f41 Mon Sep 17 00:00:00 2001

From: Marco Elver <elver@google.com>

Date: Fri, 24 Sep 2021 15:43:23 -0700

Subject: [PATCH] kasan: fix Kconfig check of CC_HAS_WORKING_NOSANITIZE_ADDRESS

Git-commit: fa360beac4b62d54879a88b182afef4b369c9700

Patch-mainline: v5.15-rc3

References: stable-5.14.10

[ Upstream commit fa360beac4b62d54879a88b182afef4b369c9700 ]

In the main KASAN config option CC_HAS_WORKING_NOSANITIZE_ADDRESS is

checked for instrumentation-based modes.  However, if

HAVE_ARCH_KASAN_HW_TAGS is true all modes may still be selected.

To fix, also make the software modes depend on

CC_HAS_WORKING_NOSANITIZE_ADDRESS.

Link: https://lkml.kernel.org/r/20210910084240.1215803-1-elver@google.com

Fixes: 6a63a63ff1ac ("kasan: introduce CONFIG_KASAN_HW_TAGS")

Signed-off-by: Marco Elver <elver@google.com>

Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>

Cc: Alexander Potapenko <glider@google.com>

Cc: Andrey Konovalov <andreyknvl@gmail.com>

Cc: Dmitry Vyukov <dvyukov@google.com>

Cc: Aleksandr Nogikh <nogikh@google.com>

Cc: Taras Madan <tarasmadan@google.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 lib/Kconfig.kasan | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan

index 1e2d10f86011..cdc842d090db 100644

--- a/lib/Kconfig.kasan

+++ b/lib/Kconfig.kasan

@@ -66,6 +66,7 @@ choice

 config KASAN_GENERIC

 	bool "Generic mode"

 	depends on HAVE_ARCH_KASAN && CC_HAS_KASAN_GENERIC

+	depends on CC_HAS_WORKING_NOSANITIZE_ADDRESS

 	select SLUB_DEBUG if SLUB

 	select CONSTRUCTORS

 	help

@@ -86,6 +87,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 CC_HAS_WORKING_NOSANITIZE_ADDRESS

 	select SLUB_DEBUG if SLUB

 	select CONSTRUCTORS

 	help

-- 

2.26.2