From patchwork Fri Apr 4 13:14:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Wieczor-Retman X-Patchwork-Id: 14038462 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB8E9C36010 for ; Fri, 4 Apr 2025 13:17:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1D8228000F; Fri, 4 Apr 2025 09:17:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCF7E280001; Fri, 4 Apr 2025 09:17:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A470028000F; Fri, 4 Apr 2025 09:17:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 82096280001 for ; Fri, 4 Apr 2025 09:17:35 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 779B01A0198 for ; Fri, 4 Apr 2025 13:17:36 +0000 (UTC) X-FDA: 83296413312.11.89171D0 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf11.hostedemail.com (Postfix) with ESMTP id 518BE40002 for ; Fri, 4 Apr 2025 13:17:34 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NNCjA02e; spf=pass (imf11.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743772654; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YmTEjrWSa8coBPFUOPSr23Xq/XeudCw3/a4+DRkDMns=; b=y4AMIw4z2vij46zJcZMl8wLn9v2uIRun6aPz8V5eqcKBSeDsg0ku70xzDh6h7iIWe0OTY/ UkwlDfNqSyGuWmkchgPdYylVT752WcvQit81+raNNRwRcJJVCa5Rnz89Qy8kvieiR/ggbL L3hUZ0sEsiHO7uz49vCdRc84ECmfEBs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743772654; a=rsa-sha256; cv=none; b=14eHq2Q4U45DEAFvTRTmHRhFMVGP0fkr6ZZZig1snJ9Pgq183pkO7fw3MD0Ysll6jp9cz2 rCU3f0Ewh7HoLI/XpZptHjOiH5NT3TewjOiSm1VJBeMhwNHxZo+GqnlNy6LUsXgXvgZy2v RWeeWFGhfu6H01JhZXU4L14DeHBLge8= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NNCjA02e; spf=pass (imf11.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.11 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743772655; x=1775308655; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RSzN8akHhL4pnE/JPwS3fyp5Znr/igOnfk7xe5eymj4=; b=NNCjA02eRrMVs8xD7Ozar4vJjXnqpjST/sbGjA5J5sVG35Ld93ZWDdYh j0/RetAdwFHlQmMZEWi8bj80Y6PQxI8T5D32p93wlO1ugl/8j6rA2qn87 IJZosMw5++vmHdsUoHVEehXLigHfNdGtTJLZlREgonfvOhWEkwsvvsdjP xnNYRvTNEiuU3Ejp1zC7uYfX/vdWS79Ucz3vfTSr9jmlx+K11rkvIDTby hNlHDR3nVWzR1rm1LFMf512PLcCvKk2lOFEoRzfHOi75cmiEtTyemOO4Q ue+iDFOupaipgqjOoiywc/argDFQrJRNC6S1nvQbb8iAnkevJ7oObLiM9 g==; X-CSE-ConnectionGUID: M2yjEtCIS36Ch0D0WKotPw== X-CSE-MsgGUID: gklvbINnQceyKU82DJi3+g== X-IronPort-AV: E=McAfee;i="6700,10204,11394"; a="55401999" X-IronPort-AV: E=Sophos;i="6.15,188,1739865600"; d="scan'208";a="55401999" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 06:17:33 -0700 X-CSE-ConnectionGUID: FCqpUyFdSE+x8MZMxgr8BA== X-CSE-MsgGUID: 2YHQdmbJQX2GJD9jL/iewQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,188,1739865600"; d="scan'208";a="128157352" Received: from opintica-mobl1 (HELO wieczorr-mobl1.intel.com) ([10.245.245.50]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 06:17:18 -0700 From: Maciej Wieczor-Retman To: hpa@zytor.com, hch@infradead.org, nick.desaulniers+lkml@gmail.com, kuan-ying.lee@canonical.com, masahiroy@kernel.org, samuel.holland@sifive.com, mingo@redhat.com, corbet@lwn.net, ryabinin.a.a@gmail.com, guoweikang.kernel@gmail.com, jpoimboe@kernel.org, ardb@kernel.org, vincenzo.frascino@arm.com, glider@google.com, kirill.shutemov@linux.intel.com, apopple@nvidia.com, samitolvanen@google.com, maciej.wieczor-retman@intel.com, kaleshsingh@google.com, jgross@suse.com, andreyknvl@gmail.com, scott@os.amperecomputing.com, tony.luck@intel.com, dvyukov@google.com, pasha.tatashin@soleen.com, ziy@nvidia.com, broonie@kernel.org, gatlin.newhouse@gmail.com, jackmanb@google.com, wangkefeng.wang@huawei.com, thiago.bauermann@linaro.org, tglx@linutronix.de, kees@kernel.org, akpm@linux-foundation.org, jason.andryuk@amd.com, snovitoll@gmail.com, xin@zytor.com, jan.kiszka@siemens.com, bp@alien8.de, rppt@kernel.org, peterz@infradead.org, pankaj.gupta@amd.com, thuth@redhat.com, andriy.shevchenko@linux.intel.com, joel.granados@kernel.org, kbingham@kernel.org, nicolas@fjasle.eu, mark.rutland@arm.com, surenb@google.com, catalin.marinas@arm.com, morbo@google.com, justinstitt@google.com, ubizjak@gmail.com, jhubbard@nvidia.com, urezki@gmail.com, dave.hansen@linux.intel.com, bhe@redhat.com, luto@kernel.org, baohua@kernel.org, nathan@kernel.org, will@kernel.org, brgerst@gmail.com Cc: llvm@lists.linux.dev, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, x86@kernel.org Subject: [PATCH v3 11/14] x86: Handle int3 for inline KASAN reports Date: Fri, 4 Apr 2025 15:14:15 +0200 Message-ID: <012c84049b853d6853a7d6c887ce0c2323bcd80a.1743772053.git.maciej.wieczor-retman@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: du75s98wzy3sztsyoq4zrita8iorcenb X-Rspam-User: X-Rspamd-Queue-Id: 518BE40002 X-Rspamd-Server: rspam08 X-HE-Tag: 1743772654-534062 X-HE-Meta: U2FsdGVkX1+JmmrPcpUjrGJ6npYUv+LhbOOpys6XQKetFyYlWpRQxQCZMBIZUMfHzIqjMWoVliMvaZP4giJTxa/9h1qB/v09FNW0JOiZigbro3Si7GqsF4fbRJK6Or6N6S52F5pYrs1Qwd/J+Jpvfool9ECUo/0rdj2y6fILUmHtpYKZ1mQ/Ya/awH3W4UB/+akkPb4scujDYY2/kPSgVvRBIEGmTPvBxwHbBhV3ewic0lLJihXUXEOyFpWonxBMf2pe/CX234VPtLNCuLNq3QusLDyjODQzylmMh3zj3YIFIXJR882LBlfJb4lQVVX6dmB0a6lfVsH0QYW9jG0+R4J+wQI9mjYffreRW7mSrpGqy6sV1/SREbcXG1D6Y9wDiwrkDgqWk94438vaXTj+bM0/jXyutD4/F5e91uB0VWdsqXlM+aopFqndDP1KjF/Tp1c7PNU4VoAMDfSB9/C9wd2QXCPsUKMJc6bF9ypQ3Wyb0aOF9LQLqRsrhg2PzziOs894cy4cEDZGG4dDgav05BTA3FcIiJXgtw2W6AgwtE644iMtC6u5daASw+nMLEzxMZCjdAECCAWaxv5JkQNlpZBIeJM+9FcXIDmIdj60eNI9XXFlTDNjaZ5Eel33GX9JwlaUok9iUOm1NZ9ugsZ4N7m5yUNK0vxHbVF29QFtSsHhWt91Jdof7TENiPl0DLTPDeAdTn32j8V+/N6AE9TiXkwxNoytSwwFkVDqDDZLiwNy3xLBf6G+3YoJwlq0USgYaPBbWxkNVvNW3fFpQOyJUcuKry0wZ98wvNsp/BwtTbxSP2H0ace+nCiXN47PsIXeTZ7+b7ih8onKxLa2dF3i8vKpz67TVZcbOV0B2EOceqSQPlwsNkSSBgqXqhBcrdCSor5y7dH8c8r0nZS5/YFJIQnrU2RI2asYicdVPpHyjyQodAGSzL2vHLsXmfCiBiqtsjVCSd0i+7bNJsslhGu kbvwPcQt KLPXBjacDdN2FhS2w40mc+TTMNmabfK/G3Uege+QSKeYRyDqzpVkWOcsskN8RppH3NOWmMDaXe7H2hx6t8CDFaA1JXa/Of/1jnzXpr6ihohRWA2sU81IIs2/WILxuo6WCAFM9n4GH5/ensgWGB0x9AUkXmTa8PudjL4fhurEMLNWjoZCN7JBWm6Sw7yd+SwPeDkqtWsviMGxuEaSjs+dPuUNxw14+ihgxMKEuVgC+pzfUhfeE8XuhVVj0AGhPrtaz/s7b X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When a tag mismatch happens in inline software tag-based KASAN on x86 an int3 instruction is executed and needs proper handling. Call kasan_report() from the int3 handler and pass down the proper information from registers - RDI should contain the problematic address and RAX other metadata. Also early return from the int3 selftest if inline KASAN is enabled since it will cause a kernel panic otherwise. Signed-off-by: Maciej Wieczor-Retman --- Changelog v3: - Add this patch to the series. arch/x86/kernel/alternative.c | 3 ++ arch/x86/kernel/traps.c | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index bf82c6f7d690..ba277a25b57f 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1979,6 +1979,9 @@ static noinline void __init int3_selftest(void) }; unsigned int val = 0; + if (IS_ENABLED(CONFIG_KASAN_INLINE)) + return; + BUG_ON(register_die_notifier(&int3_exception_nb)); /* diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 9f88b8a78e50..32c81fc2d439 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -849,6 +850,51 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection) cond_local_irq_disable(regs); } +#ifdef CONFIG_KASAN_SW_TAGS + +#define KASAN_RAX_RECOVER 0x20 +#define KASAN_RAX_WRITE 0x10 +#define KASAN_RAX_SIZE_MASK 0x0f +#define KASAN_RAX_SIZE(rax) (1 << ((rax) & KASAN_RAX_SIZE_MASK)) + +static bool kasan_handler(struct pt_regs *regs) +{ + int metadata = regs->ax; + u64 addr = regs->di; + u64 pc = regs->ip; + bool recover = metadata & KASAN_RAX_RECOVER; + bool write = metadata & KASAN_RAX_WRITE; + size_t size = KASAN_RAX_SIZE(metadata); + + if (!IS_ENABLED(CONFIG_KASAN_INLINE)) + return false; + + if (user_mode(regs)) + return false; + + kasan_report((void *)addr, size, write, pc); + + /* + * The instrumentation allows to control whether we can proceed after + * a crash was detected. This is done by passing the -recover flag to + * the compiler. Disabling recovery allows to generate more compact + * code. + * + * Unfortunately disabling recovery doesn't work for the kernel right + * now. KASAN reporting is disabled in some contexts (for example when + * the allocator accesses slab object metadata; this is controlled by + * current->kasan_depth). All these accesses are detected by the tool, + * even though the reports for them are not printed. + * + * This is something that might be fixed at some point in the future. + */ + if (!recover) + die("Oops - KASAN", regs, 0); + return true; +} + +#endif + static bool do_int3(struct pt_regs *regs) { int res; @@ -863,6 +909,12 @@ static bool do_int3(struct pt_regs *regs) if (kprobe_int3_handler(regs)) return true; #endif + +#ifdef CONFIG_KASAN_SW_TAGS + if (kasan_handler(regs)) + return true; +#endif + res = notify_die(DIE_INT3, "int3", regs, 0, X86_TRAP_BP, SIGTRAP); return res == NOTIFY_STOP;