[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250724055029.3623499-4-kees@kernel.org>
Date: Wed, 23 Jul 2025 22:50:28 -0700
From: Kees Cook <kees@...nel.org>
To: Arnd Bergmann <arnd@...db.de>
Cc: Kees Cook <kees@...nel.org>,
Masahiro Yamada <masahiroy@...nel.org>,
Nathan Chancellor <nathan@...nel.org>,
Nicolas Schier <nicolas.schier@...ux.dev>,
Marco Elver <elver@...gle.com>,
Andrey Konovalov <andreyknvl@...il.com>,
Andrey Ryabinin <ryabinin.a.a@...il.com>,
Ard Biesheuvel <ardb@...nel.org>,
"Gustavo A. R. Silva" <gustavoars@...nel.org>,
linux-kbuild@...r.kernel.org,
kasan-dev@...glegroups.com,
linux-hardening@...r.kernel.org,
Will Deacon <will@...nel.org>,
Catalin Marinas <catalin.marinas@....com>,
Jonathan Cameron <Jonathan.Cameron@...wei.com>,
Gavin Shan <gshan@...hat.com>,
"Russell King (Oracle)" <rmk+kernel@...linux.org.uk>,
James Morse <james.morse@....com>,
Oza Pawandeep <quic_poza@...cinc.com>,
Anshuman Khandual <anshuman.khandual@....com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>,
Paolo Bonzini <pbonzini@...hat.com>,
Mike Rapoport <rppt@...nel.org>,
Vitaly Kuznetsov <vkuznets@...hat.com>,
Henrique de Moraes Holschuh <hmh@....eng.br>,
Hans de Goede <hansg@...nel.org>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
"Rafael J. Wysocki" <rafael@...nel.org>,
Len Brown <lenb@...nel.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Michal Wilczynski <michal.wilczynski@...el.com>,
Juergen Gross <jgross@...e.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
"Kirill A. Shutemov" <kas@...nel.org>,
Roger Pau Monne <roger.pau@...rix.com>,
David Woodhouse <dwmw@...zon.co.uk>,
Usama Arif <usama.arif@...edance.com>,
"Guilherme G. Piccoli" <gpiccoli@...lia.com>,
Thomas Huth <thuth@...hat.com>,
Brian Gerst <brgerst@...il.com>,
Hou Wenlong <houwenlong.hwl@...group.com>,
Andrew Morton <akpm@...ux-foundation.org>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Luis Chamberlain <mcgrof@...nel.org>,
Sami Tolvanen <samitolvanen@...gle.com>,
Christophe Leroy <christophe.leroy@...roup.eu>,
Andy Lutomirski <luto@...nel.org>,
Baoquan He <bhe@...hat.com>,
Alexander Graf <graf@...zon.com>,
Changyuan Lyu <changyuanl@...gle.com>,
Paul Moore <paul@...l-moore.com>,
James Morris <jmorris@...ei.org>,
"Serge E. Hallyn" <serge@...lyn.com>,
Nick Desaulniers <nick.desaulniers+lkml@...il.com>,
Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>,
Jan Beulich <jbeulich@...e.com>,
Boqun Feng <boqun.feng@...il.com>,
Viresh Kumar <viresh.kumar@...aro.org>,
"Paul E. McKenney" <paulmck@...nel.org>,
Bibo Mao <maobibo@...ngson.cn>,
linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
x86@...nel.org,
kvm@...r.kernel.org,
ibm-acpi-devel@...ts.sourceforge.net,
platform-driver-x86@...r.kernel.org,
linux-acpi@...r.kernel.org,
linux-trace-kernel@...r.kernel.org,
linux-efi@...r.kernel.org,
linux-mm@...ck.org,
kexec@...ts.infradead.org,
linux-security-module@...r.kernel.org,
llvm@...ts.linux.dev
Subject: [PATCH v4 4/4] kstack_erase: Support Clang stack depth tracking
Wire up CONFIG_KSTACK_ERASE to Clang 21's new stack depth tracking
callback[1] option.
Link: https://clang.llvm.org/docs/SanitizerCoverage.html#tracing-stack-depth [1]
Signed-off-by: Kees Cook <kees@...nel.org>
---
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Masahiro Yamada <masahiroy@...nel.org>
Cc: Nathan Chancellor <nathan@...nel.org>
Cc: Nicolas Schier <nicolas.schier@...ux.dev>
Cc: Marco Elver <elver@...gle.com>
Cc: Andrey Konovalov <andreyknvl@...il.com>
Cc: Andrey Ryabinin <ryabinin.a.a@...il.com>
Cc: Ard Biesheuvel <ardb@...nel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
Cc: <linux-kbuild@...r.kernel.org>
Cc: <kasan-dev@...glegroups.com>
Cc: <linux-hardening@...r.kernel.org>
---
security/Kconfig.hardening | 5 ++++-
scripts/Makefile.kstack_erase | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening
index f7aa2024ab25..b9a5bc3430aa 100644
--- a/security/Kconfig.hardening
+++ b/security/Kconfig.hardening
@@ -82,10 +82,13 @@ choice
endchoice
+config CC_HAS_SANCOV_STACK_DEPTH_CALLBACK
+ def_bool $(cc-option,-fsanitize-coverage-stack-depth-callback-min=1)
+
config KSTACK_ERASE
bool "Poison kernel stack before returning from syscalls"
depends on HAVE_ARCH_KSTACK_ERASE
- depends on GCC_PLUGINS
+ depends on GCC_PLUGINS || CC_HAS_SANCOV_STACK_DEPTH_CALLBACK
help
This option makes the kernel erase the kernel stack before
returning from system calls. This has the effect of leaving
diff --git a/scripts/Makefile.kstack_erase b/scripts/Makefile.kstack_erase
index 5223d3a35817..c7bc2379e113 100644
--- a/scripts/Makefile.kstack_erase
+++ b/scripts/Makefile.kstack_erase
@@ -8,6 +8,12 @@ kstack-erase-cflags-$(CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE) += -fplugin-arg-stack
DISABLE_KSTACK_ERASE := -fplugin-arg-stackleak_plugin-disable
endif
+ifdef CONFIG_CC_IS_CLANG
+kstack-erase-cflags-y += -fsanitize-coverage=stack-depth
+kstack-erase-cflags-y += -fsanitize-coverage-stack-depth-callback-min=$(CONFIG_KSTACK_ERASE_TRACK_MIN_SIZE)
+DISABLE_KSTACK_ERASE := -fno-sanitize-coverage=stack-depth
+endif
+
KSTACK_ERASE_CFLAGS := $(kstack-erase-cflags-y)
export STACKLEAK_CFLAGS DISABLE_KSTACK_ERASE
--
2.34.1
Powered by blists - more mailing lists