From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2B7BC87FCA for ; Thu, 24 Jul 2025 09:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date :Subject:To:From:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4j17pn+//SHkaX8ONm+HlhNEvqzcDQ+QNAUfr7A3lEQ=; b=Ks0VaMUUUSiY9x P0gA6YkeeMReTrwhqxF4W48nuaSf8XzDUnrk3c51CpyPjClFbzQ0ZgR/BrfBwsERo18YOf5i9g4+6 23YoVCQbwnPeornusxfVw9Uk7sZ6UIMix9FhjGw1bVXizOf/FclaqYOIWnPb2EFoPno9lAh20mZ8c Fv2uOG8NLSCu4x9BU75vFBfDxpZGoA7x1bt/vKGOhLSjWdgciWu6JQiwDw2ZRu3LCWP7cIYeZOoLE 1W8vRnb/U/cRGGiNicbwqWUb2Zk3M72UyIeC5UimknHaDBL8m4OQe23mrYAecjMB/MK9Cxs+oyJ7T VYTEMlVrKLZ1GWAH4mbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uerqi-00000006yZz-1ezM; Thu, 24 Jul 2025 09:02:48 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ueoqe-00000006XzW-1CYw; Thu, 24 Jul 2025 05:50:36 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 1C870464DF; Thu, 24 Jul 2025 05:50:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B8E6C2BCB2; Thu, 24 Jul 2025 05:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753336230; bh=p+7YUBTmffdnZ8pKAPuZ2rzC3Zvp9P0MFRgY7Xz1ydU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QgWgAc1Z4h7uumRs3FFTKmk6zT6WYc3ZB83iSXiAZCG3NFITyJRewAAhvM7SCdTB4 RxT11O3im9HodJy3iQHDCIux7eUlVSNQW6vtNOpk+XKga6Y6fSj/9wwhDqjvs9xFUF rCGWpttB1snOwFhFvWshiFbzZcXiHhUf9pIp6AbINpGCNdRMNio67jDVRMKJBh7BuE fdkdGJldi6mApzEQpFIUP62H0n6GbSbzIk9V1TPCmz4OwMw6YkG/4j38bPS4hFhKJ2 k2xWrnI6HQnV9XChu9iVDC9Tei62bf2nNEwWaweCdPI6/DaXZd3bddGMJWg3LAw2pQ U8NDMsvEgKExw== From: Kees Cook To: Arnd Bergmann Subject: [PATCH v4 4/4] kstack_erase: Support Clang stack depth tracking Date: Wed, 23 Jul 2025 22:50:28 -0700 Message-Id: <20250724055029.3623499-4-kees@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250724054419.it.405-kees@kernel.org> References: <20250724054419.it.405-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2299; i=kees@kernel.org; h=from:subject; bh=p+7YUBTmffdnZ8pKAPuZ2rzC3Zvp9P0MFRgY7Xz1ydU=; b=owGbwMvMwCVmps19z/KJym7G02pJDBmNJ5fsPnPUwKQyTLv6YDRX59942Z9pVg4x/Z3tr6sPL i8Lmbqoo5SFQYyLQVZMkSXIzj3OxeNte7j7XEWYOaxMIEMYuDgFYCLbGRj+55xsNLv8fgpvz+zJ 97Q2v1jyfM6aXx5r3h0o/XvrBVfaBhWG/34taus75nNe6jl2+9BH9ihD5yM7dLl817dcaviWpVx +gAsA X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250723_225032_469855_41083080 X-CRM114-Status: GOOD ( 12.39 ) X-Mailman-Approved-At: Thu, 24 Jul 2025 01:12:22 -0700 X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Kirill A. Shutemov" , x86@kernel.org, Gavin Shan , Jan Beulich , kvm@vger.kernel.org, "Rafael J. Wysocki" , Kees Cook , Catalin Marinas , Dave Hansen , llvm@lists.linux.dev, Thomas Huth , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Usama Arif , Andrey Ryabinin , Viresh Kumar , linux-hardening@vger.kernel.org, Henrique de Moraes Holschuh , Oza Pawandeep , Will Deacon , Ard Biesheuvel , linux-trace-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-efi@vger.kernel.org, "H. Peter Anvin" , Michal Wilczynski , Baoquan He , linux-acpi@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org, James Morris , kasan-dev@googlegroups.com, "Peter Zijlstra \(Intel\)" , Ingo Molnar , Sami Tolvanen , Changyuan Lyu , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hou Wenlong , Nick Desaulniers , Len Brown , platform-driver-x86@vger.kernel.org, Marco Elver , Alexander Graf , "Paul E. McKenney" , Anshuman Khandual , Brian Gerst , Boqun Feng , Masami Hiramatsu , Bibo Mao , Nathan Chancellor , Paul Moore , "Russell King \(Oracle\)" , Borislav Petkov , Andy Lutomirski , Jonathan Cameron , Thomas Gleixner , Andy Shevchenko , Andrew Morton , linux-arm-kernel@lists.infradead.org, Andrey Konovalov , Juergen Gross , "Serge E. Hallyn" , Nicolas Schier , ibm-acpi-devel@lists.sourceforge.net, kexec@lists.infradead.org, "Gustavo A. R. Silva" , Luis Chamberlain , James Morse , Hans de Goede , Justin Stitt , Paolo Bonzini , Vitaly Kuznetsov , Christophe Leroy , Bill Wendling , David Woodhouse , Mike Rapoport , Roger Pau Monne Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org 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 --- Cc: Arnd Bergmann Cc: Masahiro Yamada Cc: Nathan Chancellor Cc: Nicolas Schier Cc: Marco Elver Cc: Andrey Konovalov Cc: Andrey Ryabinin Cc: Ard Biesheuvel Cc: "Gustavo A. R. Silva" Cc: Cc: Cc: --- 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