From patchwork Wed Jul 24 00:01:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gatlin Newhouse X-Patchwork-Id: 13740479 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4A34360; Wed, 24 Jul 2024 00:02:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721779334; cv=none; b=CgCdaNII5ClIrggPq3wIBnZ5rNlQFhb5/hhHh3f9BUyDz3LDXjrsJgJ7UJHumDVx0cYQyeRyRqg+6G2GOfkaDPgwYbd1iATfQtdxjEo3gpOkIPnIUrUMoIJISRF9Z5Jk7vzLywWeNdNXvOYDT66036myn6oChuo5lrfpSqvv4Vk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721779334; c=relaxed/simple; bh=Gv1Va0LhcK297gekJ0IRzqznjSa0jRvTerUwmZlKlbU=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=YvgFzre+SfzresTGnuD/Kev0XFbu/V58ICaFKv1jEdjkcks37pxk/NgzE6M96qLp9LE/5cT2f25FTtDsOMbDrHN1jUQElYYBTbuC7OXKtVeRC7gKp+wyFZqnBjsBcG2R+kP8hSgpQiyMA+cBymClXmPaAI0WFdy1I7MxHjYKIoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RGtVqtCq; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RGtVqtCq" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1fc60c3ead4so10464605ad.0; Tue, 23 Jul 2024 17:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721779332; x=1722384132; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=J7TczzH2tG87Dboe8Qnrv2Pil29SChCNw100rbqjvPs=; b=RGtVqtCqpVqT63/ePx+rLmNbNyQPavfcXVxbycMutIDfBZJ6a4EbsdhKfOoKN9c2Tr XMJ3l1ub3vTanYoV/4F0hWEQF6gcQc7fj2Um0OUXmExyFwkIXjUiuOqMLdfQIIQCzXor I+S9Ie317Nx6pqe3ufeiOOndm6UZeaKWWea6IYIdxNqvpd72WqIJLSIkF8LXwsPu3Zw3 BQjeurmaS+jIRM/DTNbM6ZroVFB4fULiMdgA5/3bFnkmMrCNDrb/JiDztx5peNsWDJbf FaMo5LUjm+HAUcZCiNE93UaFsNOee3CUYPIHpUZk48wST2m1gLb0LRe4kaAv94zU4L06 BfZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721779332; x=1722384132; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J7TczzH2tG87Dboe8Qnrv2Pil29SChCNw100rbqjvPs=; b=lmpBqmdewrPztG6TaNLqDclD7nJIYCyjTxTxdatrcWlfnB5S3VJDK3/FQ4vS7PPKsb 0hbp28VLJK/ldxVZhRL6tlUIlcTC11St1PI8sC9TBSpHIDQG9RHBwyos4kidCj6m3yoe i6PcOS3/Ajjp1K+IFkUe8m8q0RjWi4Vo4uYLwCdNSpgwTGyRGoTpwARgJNGXMIFi1N7f XCYRrU2epVyzteQJu0cNyHD6xyTk+GiznDdN4c2RgBmE3NP4KQBHxtZrEbIaOqYZIp7R x04yd3TrhPgGfoeiwFJcofMoDJhvCeM7RahV/6XxVnVPVj9JuAi+mbtHiOKYAvyaopAk 75TQ== X-Forwarded-Encrypted: i=1; AJvYcCXkiBwupXXoOG7L9mX4l3C0iHfoBw8ElAm6ZMDGYcjNJYKwUs7gDv264puqdaCoPFj/KRpdq6vFoayA3/IiV5lD7YSJU8CWdKHPs54Nj+UZ3jjGi2GmQGV17B5JitdfoHVGoi+FLRrjfGzGDYAY X-Gm-Message-State: AOJu0YxkwkpuFnas4fGZQV5x4NI6XTBfJ2AhDvqQjef6lrE490wov58n 1iOyw9FnTqef912KPSBNUNegJzsPoU7SO3MfIrkbtr+NrRnlEpRA X-Google-Smtp-Source: AGHT+IEIS9WKkAuFxYQLUluS/fWnOLeeErgN4r9R/NVARCrFNuZP/cbIri/buBMIa0aZ+Mm9uzE1cA== X-Received: by 2002:a17:903:2346:b0:1fb:719a:28e2 with SMTP id d9443c01a7336-1fdd5512b9emr7633105ad.21.1721779331756; Tue, 23 Jul 2024 17:02:11 -0700 (PDT) Received: from localhost.localdomain ([2604:a880:4:1d0::427:6000]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1fd93d3018bsm52093745ad.69.2024.07.23.17.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 17:02:11 -0700 (PDT) From: Gatlin Newhouse To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Kees Cook , Marco Elver , Andrey Konovalov , Andrey Ryabinin , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Gatlin Newhouse , Andrew Morton , Baoquan He , "Mike Rapoport (IBM)" , Josh Poimboeuf , Changbin Du , Rick Edgecombe , Pengfei Xu , Jason Gunthorpe , Xin Li , Uros Bizjak , "Kirill A. Shutemov" , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH v5] x86/traps: Enable UBSAN traps on x86 Date: Wed, 24 Jul 2024 00:01:55 +0000 Message-Id: <20240724000206.451425-1-gatlin.newhouse@gmail.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently ARM architectures extract which specific sanitizer has caused a trap via encoded data in the trap instruction.[1] Clang on x86 currently encodes the same data in ud1 instructions but the x86 handle_bug() and is_valid_bugaddr() functions currently only look at ud2s. Bring x86 to parity with arm64, similar to commit 25b84002afb9 ("arm64: Support Clang UBSAN trap codes for better reporting"). Enable the reporting of UBSAN sanitizer detail on x86 architectures compiled with clang when CONFIG_UBSAN_TRAP=y. [1] Details are in llvm/lib/Target/X86/X86MCInstLower.cpp. See: https://github.com/llvm/llvm-project/commit/c5978f42ec8e9#diff-bb68d7cd885f41cfc35843998b0f9f534adb60b415f647109e597ce448e92d9f EmitAndCountInstruction() uses the UD1Lm template, which uses a OpSize32. See: https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/X86/X86InstrSystem.td#L27 Signed-off-by: Gatlin Newhouse Acked-by: Peter Zijlstra (Intel) --- Changes in v5: - Added references to the LLVM commits in the commit message from Kees and Marco's feedback - Renamed incorrect defines, and removed handle_ubsan_failure()'s duplicated work per Peter's feedback Changes in v4: - Implement Peter's suggestions for decode_bug(), and fix inconsistent capitalization in hex values. Changes in v3: - Address Thomas's remarks about: change log structure, get_ud_type() instead of is_valid_bugaddr(), handle_bug() changes, and handle_ubsan_failure(). Changes in v2: - Name the new constants 'LEN_ASOP' and 'INSN_ASOP' instead of 'LEN_REX' and 'INSN_REX' - Change handle_ubsan_failure() from enum bug_trap_type to void function v1: https://lore.kernel.org/linux-hardening/20240529022043.3661757-1-gatlin.newhouse@gmail.com/ v2: https://lore.kernel.org/linux-hardening/20240601031019.3708758-1-gatlin.newhouse@gmail.com/ v3: https://lore.kernel.org/linux-hardening/20240625032509.4155839-1-gatlin.newhouse@gmail.com/ v4: https://lore.kernel.org/linux-hardening/20240710203250.238782-1-gatlin.newhouse@gmail.com/ --- MAINTAINERS | 2 ++ arch/x86/include/asm/bug.h | 12 ++++++++ arch/x86/include/asm/ubsan.h | 18 ++++++++++++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/traps.c | 57 ++++++++++++++++++++++++++++++++---- arch/x86/kernel/ubsan.c | 19 ++++++++++++ 6 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 arch/x86/include/asm/ubsan.h create mode 100644 arch/x86/kernel/ubsan.c diff --git a/MAINTAINERS b/MAINTAINERS index 28e20975c26f..b8512887ffb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22635,6 +22635,8 @@ L: kasan-dev@googlegroups.com L: linux-hardening@vger.kernel.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening +F: arch/x86/include/asm/ubsan.h +F: arch/x86/kernel/ubsan.c F: Documentation/dev-tools/ubsan.rst F: include/linux/ubsan.h F: lib/Kconfig.ubsan diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index a3ec87d198ac..751e45ea27ca 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -13,6 +13,18 @@ #define INSN_UD2 0x0b0f #define LEN_UD2 2 +/* + * In clang we have UD1s reporting UBSAN failures on X86, 64 and 32bit. + */ +#define INSN_ASOP 0x67 +#define OPCODE_ESCAPE 0x0f +#define SECOND_BYTE_OPCODE_UD1 0xb9 +#define SECOND_BYTE_OPCODE_UD2 0x0b + +#define BUG_NONE 0xffff +#define BUG_UD1 0xfffe +#define BUG_UD2 0xfffd + #ifdef CONFIG_GENERIC_BUG #ifdef CONFIG_X86_32 diff --git a/arch/x86/include/asm/ubsan.h b/arch/x86/include/asm/ubsan.h new file mode 100644 index 000000000000..1d7c2b4129de --- /dev/null +++ b/arch/x86/include/asm/ubsan.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_UBSAN_H +#define _ASM_X86_UBSAN_H + +/* + * Clang Undefined Behavior Sanitizer trap mode support. + */ +#include +#include +#include + +#ifdef CONFIG_UBSAN_TRAP +void handle_ubsan_failure(struct pt_regs *regs, u32 type); +#else +static inline void handle_ubsan_failure(struct pt_regs *regs, u32 type) { return; } +#endif /* CONFIG_UBSAN_TRAP */ + +#endif /* _ASM_X86_UBSAN_H */ diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 74077694da7d..fe1d9db27500 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -145,6 +145,7 @@ obj-$(CONFIG_UNWINDER_GUESS) += unwind_guess.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += sev.o obj-$(CONFIG_CFI_CLANG) += cfi.o +obj-$(CONFIG_UBSAN_TRAP) += ubsan.o obj-$(CONFIG_CALL_THUNKS) += callthunks.o diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 4fa0b17e5043..6350d00a6555 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -67,6 +67,7 @@ #include #include #include +#include #ifdef CONFIG_X86_64 #include @@ -91,6 +92,45 @@ __always_inline int is_valid_bugaddr(unsigned long addr) return *(unsigned short *)addr == INSN_UD2; } +/* + * Check for UD1 or UD2, accounting for Address Size Override Prefixes. + * If it's a UD1, get the ModRM byte to pass along to UBSan. + */ +__always_inline int decode_bug(unsigned long addr, u32 *imm) +{ + u8 v; + + if (addr < TASK_SIZE_MAX) + return BUG_NONE; + + v = *(u8 *)(addr++); + if (v == INSN_ASOP) + v = *(u8 *)(addr++); + if (v != OPCODE_ESCAPE) + return BUG_NONE; + + v = *(u8 *)(addr++); + if (v == SECOND_BYTE_OPCODE_UD2) + return BUG_UD2; + if (v != SECOND_BYTE_OPCODE_UD1) + return BUG_NONE; + + v = *(u8 *)(addr++); + if (X86_MODRM_RM(v) == 4) + addr++; + + *imm = 0; + if (X86_MODRM_MOD(v) == 1) + *imm = *(u8 *)addr; + else if (X86_MODRM_MOD(v) == 2) + *imm = *(u32 *)addr; + else + WARN_ONCE(1, "Unexpected MODRM_MOD: %u\n", X86_MODRM_MOD(v)); + + return BUG_UD1; +} + + static nokprobe_inline int do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str, struct pt_regs *regs, long error_code) @@ -216,6 +256,8 @@ static inline void handle_invalid_op(struct pt_regs *regs) static noinstr bool handle_bug(struct pt_regs *regs) { bool handled = false; + int ud_type; + u32 imm; /* * Normally @regs are unpoisoned by irqentry_enter(), but handle_bug() @@ -223,7 +265,8 @@ static noinstr bool handle_bug(struct pt_regs *regs) * irqentry_enter(). */ kmsan_unpoison_entry_regs(regs); - if (!is_valid_bugaddr(regs->ip)) + ud_type = decode_bug(regs->ip, &imm); + if (ud_type == BUG_NONE) return handled; /* @@ -236,10 +279,14 @@ static noinstr bool handle_bug(struct pt_regs *regs) */ if (regs->flags & X86_EFLAGS_IF) raw_local_irq_enable(); - if (report_bug(regs->ip, regs) == BUG_TRAP_TYPE_WARN || - handle_cfi_failure(regs) == BUG_TRAP_TYPE_WARN) { - regs->ip += LEN_UD2; - handled = true; + if (ud_type == BUG_UD2) { + if (report_bug(regs->ip, regs) == BUG_TRAP_TYPE_WARN || + handle_cfi_failure(regs) == BUG_TRAP_TYPE_WARN) { + regs->ip += LEN_UD2; + handled = true; + } + } else { + handle_ubsan_failure(regs, imm); } if (regs->flags & X86_EFLAGS_IF) raw_local_irq_disable(); diff --git a/arch/x86/kernel/ubsan.c b/arch/x86/kernel/ubsan.c new file mode 100644 index 000000000000..63f819928820 --- /dev/null +++ b/arch/x86/kernel/ubsan.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Clang Undefined Behavior Sanitizer trap mode support. + */ +#include +#include +#include +#include +#include +#include + +/* + * Checks for the information embedded in the UD1 trap instruction + * for the UB Sanitizer in order to pass along debugging output. + */ +void handle_ubsan_failure(struct pt_regs *regs, u32 type) +{ + pr_crit("%s at %pS\n", report_ubsan_failure(regs, type), (void *)regs->ip); +}