From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 B2C0F612E for ; Tue, 30 Aug 2022 23:32:31 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-33dc888dc62so190496237b3.4 for ; Tue, 30 Aug 2022 16:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date; bh=muitaXVvYj1YXYeJfyrYZvippOQN3ekQHC+LkfXxbLc=; b=qZpclqQ6MsBQZUyMbRHl5nEFHLKVNuncCaq+7Pxg2KT6XNS9xA08pBlGHG3JYut1v1 TRvpdM8IY5fuCJoqsdbv+sWXvtCe0pTC8mj6QL8JS54ZIaAga8BWb6ikSMZwyF8wo1Mp 1IzskPITy3h8+PbYnC19RDCtSEjS9+naLaqxPL38hvyOcW+Wjjnkp5Vu6l4DRpZa2MVw /qLkeHfR5fxAiGbQ3ASQz7tXDU/Ojm5437GZxvJMzZGw2uZgFS6bO7kXNuCOzB8SUj8u ve7L7kOPTIzBNV8TWMg8uLMQMD4aJ+E2OFqj7Rzu0cUj+dVwgYL7lld5b1V4BmU78331 S9yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date; bh=muitaXVvYj1YXYeJfyrYZvippOQN3ekQHC+LkfXxbLc=; b=6LECv5K4sBQCAjItBeVLI5pLR/3XMs3KhjLKb8H2x+EMahyNjU4kb1cbgCtxIcG9uC ry6cy9gYKBed7R2cl/mS1wA5yF9iJQPqGiI1e6ZvAC/g1X5PL/KCNS09GTWwtOwJgWFG uGDDvL5U2xloZiUkBV+Npzic5PBlYetZ1EosA9dKykzcC/3hOnk44p2h4ImABRbGXTqb PgEaeZ/4ngyxtu/YM9cRqD9T0eZVbc/w4+RuhbPZOUlcNOk5iiJz/gw9U6pViRk8COB6 lIAkdz4NSINu2kQtBem/ZmIyCOOKM0HreaJIozu7jAHTfXupanVAP8nhVghb0sAS4ptW XqeA== X-Gm-Message-State: ACgBeo1/BADlaISEdP4+I8Cr4Yy/YYS7YjJVKyrktf+7hEVHs48ycRYQ zL2s+6OvtNtAOp/H2AwWnIsDYvc5uqy0yyt0TYU= X-Google-Smtp-Source: AA6agR5mmw1lyTMjEbXO+bj0XMfoKQXjrA7x+3+LfFFUJRrRakcxIdBjBJC8pQKjP8yP5Cacc+4B59TMcKFo3CTBMQ8= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:54d9:7143:6a7d:91d]) (user=samitolvanen job=sendgmr) by 2002:a25:2c8:0:b0:695:feaa:871f with SMTP id 191-20020a2502c8000000b00695feaa871fmr14222519ybc.471.1661902350818; Tue, 30 Aug 2022 16:32:30 -0700 (PDT) Date: Tue, 30 Aug 2022 16:31:29 -0700 In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> Message-Id: <20220830233129.30610-22-samitolvanen@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20220830233129.30610-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=10374; i=samitolvanen@google.com; h=from:subject; bh=xx8wjcYE8Du0racyo2HoO5M6w+PYgPKqDWnfLGl3DjU=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBjDp3PPFzSBxPnL1McANFd1sNHrlLrdWSxt2cbevI6 OTWO0UqJAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYw6dzwAKCRBMtfaEi7xW7uukC/ 9uM+7HvXyQ67VflXgAsC/YncRdBoq4yhl8rYfT2i05OWqPjoWHJG8Ya/UI5iY6oAeiaG49tfhTVdrJ pUyR3viQo7OIVPeVuzfeHP0eguun9EReYSQcKQGYAV4XfwQ4hFEKT254SvMUfU/M/3EWaS7HN4mNz4 QJK4XkW4SPhA7RBnDLN3EQJPwljXDQ7+t5wNksrguQOfmbffYUJPcP/HC8oNr1lIRstWm3BrwbIJaD MAsUDvpax1bIHiYl6DHoiFijKWm88sHuPFQFFnxGE0U4g/pm+dzy+wirAFnCNNK/RGdmP3fdBqzLSI Ul3ndBsIwZACrYvIZ37KXR82etUCnuTGSvqwWPAnY4rizeCV8SEBvqmVV2EWIAClYLSj6ICZQJRyeX rzdvbADWzQdLSvLP7rGWgi5MQSYwwYbc15tpgtuhFe0HwpsWbo8jxfrJUVzM4T5CXHBy3OqY/UZZrp 0/EHk1+pMYKAO0vzlUhH3g28B4J9GI5syiuW13VGIgv/E= X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Subject: [PATCH v4 21/21] x86: Add support for CONFIG_CFI_CLANG From: Sami Tolvanen To: linux-kernel@vger.kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Nick Desaulniers , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable With CONFIG_CFI_CLANG, the compiler injects a type preamble immediately before each function and a check to validate the target function type before indirect calls: ; type preamble __cfi_function: mov , %eax function: ... ; indirect call check mov -,%r10d add -0x4(%r11),%r10d je .Ltmp1 ud2 .Ltmp1: call __x86_indirect_thunk_r11 Define the __CFI_TYPE helper macro for manually annotating indirectly called assembly function with the identical premable, add error handling code for the ud2 traps emitted for indirect call checks, and allow CONFIG_CFI_CLANG to be selected on x86_64. This produces the following oops on CFI failure (generated using lkdtm): [ 21.441706] CFI failure at lkdtm_indirect_call+0x16/0x20 [lkdtm] (target: lkdtm_increment_int+0x0/0x10 [lkdtm]; expected type: 0x7e0c52a) [ 21.444579] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 21.445296] CPU: 0 PID: 132 Comm: sh Not tainted 5.19.0-rc8-00020-g9f27360e674c #1 [ 21.445296] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [ 21.445296] RIP: 0010:lkdtm_indirect_call+0x16/0x20 [lkdtm] [ 21.445296] Code: 52 1c c0 48 c7 c1 c5 50 1c c0 e9 25 48 2a cc 0f 1f 44 00 00 49 89 fb 48 c7 c7 50 b4 1c c0 41 ba 5b ad f3 81 45 03 53 f8 [ 21.445296] RSP: 0018:ffffa9f9c02ffdc0 EFLAGS: 00000292 [ 21.445296] RAX: 0000000000000027 RBX: ffffffffc01cb300 RCX: 385cbbd2e07= 0a700 [ 21.445296] RDX: 0000000000000000 RSI: c0000000ffffdfff RDI: ffffffffc01= cb450 [ 21.445296] RBP: 0000000000000006 R08: 0000000000000000 R09: ffffffff8d0= 81610 [ 21.445296] R10: 00000000bcc90825 R11: ffffffffc01c2fc0 R12: 00000000000= 00000 [ 21.445296] R13: ffffa31b827a6000 R14: 0000000000000000 R15: 00000000000= 00002 [ 21.445296] FS: 00007f08b42216a0(0000) GS:ffffa31b9f400000(0000) knlGS:0000000000000000 [ 21.445296] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 21.445296] CR2: 0000000000c76678 CR3: 0000000001940000 CR4: 00000000000= 006f0 [ 21.445296] Call Trace: [ 21.445296] [ 21.445296] lkdtm_CFI_FORWARD_PROTO+0x30/0x50 [lkdtm] [ 21.445296] direct_entry+0x12d/0x140 [lkdtm] [ 21.445296] full_proxy_write+0x5d/0xb0 [ 21.445296] vfs_write+0x144/0x460 [ 21.445296] ? __x64_sys_wait4+0x5a/0xc0 [ 21.445296] ksys_write+0x69/0xd0 [ 21.445296] do_syscall_64+0x51/0xa0 [ 21.445296] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 21.445296] RIP: 0033:0x7f08b41a6fe1 [ 21.445296] Code: be 07 00 00 00 41 89 c0 e8 7e ff ff ff 44 89 c7 89 04 24 e8 91 c6 02 00 8b 04 24 48 83 c4 68 c3 48 63 ff b8 01 00 00 03 [ 21.445296] RSP: 002b:00007ffcdf65c2e8 EFLAGS: 00000246 ORIG_RAX: 000000= 0000000001 [ 21.445296] RAX: ffffffffffffffda RBX: 00007f08b4221690 RCX: 00007f08b41= a6fe1 [ 21.445296] RDX: 0000000000000012 RSI: 0000000000c738f0 RDI: 00000000000= 00001 [ 21.445296] RBP: 0000000000000001 R08: fefefefefefefeff R09: fefefefeffc= 5ff4e [ 21.445296] R10: 00007f08b42222b0 R11: 0000000000000246 R12: 0000000000c= 738f0 [ 21.445296] R13: 0000000000000012 R14: 00007ffcdf65c401 R15: 0000000000c= 70450 [ 21.445296] [ 21.445296] Modules linked in: lkdtm [ 21.445296] Dumping ftrace buffer: [ 21.445296] (ftrace buffer empty) [ 21.471442] ---[ end trace 0000000000000000 ]--- [ 21.471811] RIP: 0010:lkdtm_indirect_call+0x16/0x20 [lkdtm] [ 21.472467] Code: 52 1c c0 48 c7 c1 c5 50 1c c0 e9 25 48 2a cc 0f 1f 44 00 00 49 89 fb 48 c7 c7 50 b4 1c c0 41 ba 5b ad f3 81 45 03 53 f8 [ 21.474400] RSP: 0018:ffffa9f9c02ffdc0 EFLAGS: 00000292 [ 21.474735] RAX: 0000000000000027 RBX: ffffffffc01cb300 RCX: 385cbbd2e07= 0a700 [ 21.475664] RDX: 0000000000000000 RSI: c0000000ffffdfff RDI: ffffffffc01= cb450 [ 21.476471] RBP: 0000000000000006 R08: 0000000000000000 R09: ffffffff8d0= 81610 [ 21.477127] R10: 00000000bcc90825 R11: ffffffffc01c2fc0 R12: 00000000000= 00000 [ 21.477959] R13: ffffa31b827a6000 R14: 0000000000000000 R15: 00000000000= 00002 [ 21.478657] FS: 00007f08b42216a0(0000) GS:ffffa31b9f400000(0000) knlGS:0000000000000000 [ 21.479577] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 21.480307] CR2: 0000000000c76678 CR3: 0000000001940000 CR4: 00000000000= 006f0 [ 21.481460] Kernel panic - not syncing: Fatal exception Signed-off-by: Sami Tolvanen --- arch/x86/Kconfig | 2 + arch/x86/include/asm/cfi.h | 22 +++++++++ arch/x86/include/asm/linkage.h | 9 ++++ arch/x86/kernel/Makefile | 2 + arch/x86/kernel/cfi.c | 85 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/traps.c | 4 +- 6 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 arch/x86/include/asm/cfi.h create mode 100644 arch/x86/kernel/cfi.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f9920f1341c8..1fe6a83dac05 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -107,6 +107,8 @@ config X86 select ARCH_SUPPORTS_PAGE_TABLE_CHECK if X86_64 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64 select ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP if NR_CPUS <=3D 4096 + select ARCH_SUPPORTS_CFI_CLANG if X86_64 + select ARCH_USES_CFI_TRAPS if X86_64 && CFI_CLANG select ARCH_SUPPORTS_LTO_CLANG select ARCH_SUPPORTS_LTO_CLANG_THIN select ARCH_USE_BUILTIN_BSWAP diff --git a/arch/x86/include/asm/cfi.h b/arch/x86/include/asm/cfi.h new file mode 100644 index 000000000000..58dacd90daef --- /dev/null +++ b/arch/x86/include/asm/cfi.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_CFI_H +#define _ASM_X86_CFI_H + +/* + * Clang Control Flow Integrity (CFI) support. + * + * Copyright (C) 2022 Google LLC + */ + +#include + +#ifdef CONFIG_CFI_CLANG +enum bug_trap_type handle_cfi_failure(struct pt_regs *regs); +#else +static inline enum bug_trap_type handle_cfi_failure(struct pt_regs *regs) +{ + return BUG_TRAP_TYPE_NONE; +} +#endif /* CONFIG_CFI_CLANG */ + +#endif /* _ASM_X86_CFI_H */ diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.= h index 73ca20049835..ebfa05973312 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -29,6 +29,15 @@ #endif #endif /* CONFIG_RETPOLINE */ =20 +#ifdef CONFIG_CFI_CLANG +#define __CFI_TYPE(name) \ + SYM_START(__cfi_##name, SYM_L_LOCAL, SYM_A_NONE) \ + .fill 11, 1, 0x90 ASM_NL \ + .byte 0xb8 ASM_NL \ + .long __kcfi_typeid_##name ASM_NL \ + SYM_FUNC_END(__cfi_##name) +#endif + #else /* __ASSEMBLY__ */ =20 #if defined(CONFIG_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUI= LD_VDSO) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index a20a5ebfacd7..1286a73ebdbc 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -139,6 +139,8 @@ obj-$(CONFIG_UNWINDER_GUESS) +=3D unwind_guess.o =20 obj-$(CONFIG_AMD_MEM_ENCRYPT) +=3D sev.o =20 +obj-$(CONFIG_CFI_CLANG) +=3D cfi.o + ### # 64 bit specific files ifeq ($(CONFIG_X86_64),y) diff --git a/arch/x86/kernel/cfi.c b/arch/x86/kernel/cfi.c new file mode 100644 index 000000000000..e642c1af2678 --- /dev/null +++ b/arch/x86/kernel/cfi.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Clang Control Flow Integrity (CFI) support. + * + * Copyright (C) 2022 Google LLC + */ +#include +#include +#include + +/* + * Returns the target address and the expected type when regs->ip points + * to a compiler-generated CFI trap. + */ +static bool decode_cfi_insn(struct pt_regs *regs, unsigned long *target, + u32 *type) +{ + char buffer[MAX_INSN_SIZE]; + struct insn insn; + int offset =3D 0; + + *target =3D *type =3D 0; + + /* + * The compiler generates the following instruction sequence + * for indirect call checks: + * + * =C2=A0 movl -, %r10d ; 6 bytes + * addl -4(%reg), %r10d ; 4 bytes + * je .Ltmp1 ; 2 bytes + * ud2 ; <- regs->ip + * .Ltmp1: + * + * We can decode the expected type and the target address from the + * movl/addl instructions. + */ + if (copy_from_kernel_nofault(buffer, (void *)regs->ip - 12, MAX_INSN_SIZE= )) + return false; + if (insn_decode_kernel(&insn, &buffer[offset])) + return false; + if (insn.opcode.value !=3D 0xBA) + return false; + + *type =3D -(u32)insn.immediate.value; + + if (copy_from_kernel_nofault(buffer, (void *)regs->ip - 6, MAX_INSN_SIZE)= ) + return false; + if (insn_decode_kernel(&insn, &buffer[offset])) + return false; + if (insn.opcode.value !=3D 0x3) + return false; + + /* Read the target address from the register. */ + offset =3D insn_get_modrm_rm_off(&insn, regs); + if (offset < 0) + return false; + + *target =3D *(unsigned long *)((void *)regs + offset); + + return true; +} + +/* + * Checks if a ud2 trap is because of a CFI failure, and handles the trap + * if needed. Returns a bug_trap_type value similarly to report_bug. + */ +enum bug_trap_type handle_cfi_failure(struct pt_regs *regs) +{ + unsigned long target; + u32 type; + + if (!is_cfi_trap(regs->ip)) + return BUG_TRAP_TYPE_NONE; + + if (!decode_cfi_insn(regs, &target, &type)) + return report_cfi_failure_noaddr(regs, regs->ip); + + return report_cfi_failure(regs, regs->ip, &target, type); +} + +/* + * Ensure that __kcfi_typeid_ symbols are emitted for functions that may + * not be indirectly called with all configurations. + */ +__ADDRESSABLE(memcpy) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index d62b2cb85cea..178015a820f0 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -63,6 +63,7 @@ #include #include #include +#include =20 #ifdef CONFIG_X86_64 #include @@ -313,7 +314,8 @@ 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) =3D=3D BUG_TRAP_TYPE_WARN) { + if (report_bug(regs->ip, regs) =3D=3D BUG_TRAP_TYPE_WARN || + handle_cfi_failure(regs) =3D=3D BUG_TRAP_TYPE_WARN) { regs->ip +=3D LEN_UD2; handled =3D true; } --=20 2.37.2.672.g94769d06f0-goog 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 47EFBECAAD4 for ; Tue, 30 Aug 2022 23:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1PXfcD+TyKWDAQqaMQRl0aF6Z7T/fVuQgDtYKoCoLZo=; b=cdq0IdSyiNN+8MuLuYUaolgu7M DPf0T1lPIFiONgbPkJgM/GaCD5r/L3lNN5rXkUozXFhJOIuGMr+QOpYj5BYW4S8kjS0mZpKqEdONw ZEnD+JoAflpcv2F0kb7LAPehFOX9VDMtvtAmAyaw84u5+8bnV/xq2Za7OyrB1buZFBOxBCbbyz23X g1dE4nJZB3RNa/LyjFU9WuVlG3ynl24bnB9ITgOJ2/z2VX0Y30cJ4qTwNHxYEZC2OXo8hMxJwLcfl 4Cr7bLsp1p7egziWn5KGJEI9X+mzqKSc8fg6gQ8vfjrGXIYEyZoFk7Gn9fzLSNhgIJujCGtQZXIQV 9322lb/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTAkm-002UPT-LZ; Tue, 30 Aug 2022 23:34:45 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTAie-002T1U-HQ for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2022 23:32:34 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id f12-20020a25b6cc000000b0069a9e36de26so876564ybm.16 for ; Tue, 30 Aug 2022 16:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date; bh=muitaXVvYj1YXYeJfyrYZvippOQN3ekQHC+LkfXxbLc=; b=qZpclqQ6MsBQZUyMbRHl5nEFHLKVNuncCaq+7Pxg2KT6XNS9xA08pBlGHG3JYut1v1 TRvpdM8IY5fuCJoqsdbv+sWXvtCe0pTC8mj6QL8JS54ZIaAga8BWb6ikSMZwyF8wo1Mp 1IzskPITy3h8+PbYnC19RDCtSEjS9+naLaqxPL38hvyOcW+Wjjnkp5Vu6l4DRpZa2MVw /qLkeHfR5fxAiGbQ3ASQz7tXDU/Ojm5437GZxvJMzZGw2uZgFS6bO7kXNuCOzB8SUj8u ve7L7kOPTIzBNV8TWMg8uLMQMD4aJ+E2OFqj7Rzu0cUj+dVwgYL7lld5b1V4BmU78331 S9yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date; bh=muitaXVvYj1YXYeJfyrYZvippOQN3ekQHC+LkfXxbLc=; b=7FWjyDmivPFtZKaD9R9E8QmzYUWjN+mYHes5A4rWBlVzN/Y874Ix2bK8JOysaIDI9s b/cpkrd0UeTsANPoXbVZe+Xm+OS45O2MuClpjz9JCg8QiVaIslVpCPsuTqxvTaX9HDSb pQRuOWmMXmBsGZqyEQ06gpSlheRAokUQMaTrOpC2gA1KqJAqEA0OAaZUW8pKd2mYj1d4 hPj+7ypo8rdumZbarlq0P4X9aHHBhtFphCotibYwNQ0EGuu5mzfSRMqQjBd4eH/MRlm7 qBA74l2inWgpS+X9vYjbPPIhI66Dxu6cdl1tnyKtwrvrYDCe5FViompLbNweRZsFOtjO h+Uw== X-Gm-Message-State: ACgBeo0POC4LkMnbRe14D/CJ1lbzPM7qk+jLJaS7ILyPlgEpgVRkKzAd MCnbU+DS/JzFDTvOY7csNz5s0KiH6duxGZ8t4wA= X-Google-Smtp-Source: AA6agR5mmw1lyTMjEbXO+bj0XMfoKQXjrA7x+3+LfFFUJRrRakcxIdBjBJC8pQKjP8yP5Cacc+4B59TMcKFo3CTBMQ8= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:54d9:7143:6a7d:91d]) (user=samitolvanen job=sendgmr) by 2002:a25:2c8:0:b0:695:feaa:871f with SMTP id 191-20020a2502c8000000b00695feaa871fmr14222519ybc.471.1661902350818; Tue, 30 Aug 2022 16:32:30 -0700 (PDT) Date: Tue, 30 Aug 2022 16:31:29 -0700 In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> Message-Id: <20220830233129.30610-22-samitolvanen@google.com> Mime-Version: 1.0 References: <20220830233129.30610-1-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=10374; i=samitolvanen@google.com; h=from:subject; bh=xx8wjcYE8Du0racyo2HoO5M6w+PYgPKqDWnfLGl3DjU=; b=owEB7QES/pANAwAKAUy19oSLvFbuAcsmYgBjDp3PPFzSBxPnL1McANFd1sNHrlLrdWSxt2cbevI6 OTWO0UqJAbMEAAEKAB0WIQQ1zPtjsoPW0663g5RMtfaEi7xW7gUCYw6dzwAKCRBMtfaEi7xW7uukC/ 9uM+7HvXyQ67VflXgAsC/YncRdBoq4yhl8rYfT2i05OWqPjoWHJG8Ya/UI5iY6oAeiaG49tfhTVdrJ pUyR3viQo7OIVPeVuzfeHP0eguun9EReYSQcKQGYAV4XfwQ4hFEKT254SvMUfU/M/3EWaS7HN4mNz4 QJK4XkW4SPhA7RBnDLN3EQJPwljXDQ7+t5wNksrguQOfmbffYUJPcP/HC8oNr1lIRstWm3BrwbIJaD MAsUDvpax1bIHiYl6DHoiFijKWm88sHuPFQFFnxGE0U4g/pm+dzy+wirAFnCNNK/RGdmP3fdBqzLSI Ul3ndBsIwZACrYvIZ37KXR82etUCnuTGSvqwWPAnY4rizeCV8SEBvqmVV2EWIAClYLSj6ICZQJRyeX rzdvbADWzQdLSvLP7rGWgi5MQSYwwYbc15tpgtuhFe0HwpsWbo8jxfrJUVzM4T5CXHBy3OqY/UZZrp 0/EHk1+pMYKAO0vzlUhH3g28B4J9GI5syiuW13VGIgv/E= X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Subject: [PATCH v4 21/21] x86: Add support for CONFIG_CFI_CLANG From: Sami Tolvanen To: linux-kernel@vger.kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Nick Desaulniers , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220830_163232_670272_E5A6790D X-CRM114-Status: GOOD ( 28.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org V2l0aCBDT05GSUdfQ0ZJX0NMQU5HLCB0aGUgY29tcGlsZXIgaW5qZWN0cyBhIHR5cGUgcHJlYW1i bGUgaW1tZWRpYXRlbHkKYmVmb3JlIGVhY2ggZnVuY3Rpb24gYW5kIGEgY2hlY2sgdG8gdmFsaWRh dGUgdGhlIHRhcmdldCBmdW5jdGlvbiB0eXBlCmJlZm9yZSBpbmRpcmVjdCBjYWxsczoKCiAgOyB0 eXBlIHByZWFtYmxlCiAgX19jZmlfZnVuY3Rpb246CiAgICBtb3YgPGlkPiwgJWVheAogIGZ1bmN0 aW9uOgogICAgLi4uCiAgOyBpbmRpcmVjdCBjYWxsIGNoZWNrCiAgICBtb3YgICAgIC08aWQ+LCVy MTBkCiAgICBhZGQgICAgIC0weDQoJXIxMSksJXIxMGQKICAgIGplICAgICAgLkx0bXAxCiAgICB1 ZDIKICAuTHRtcDE6CiAgICBjYWxsICAgIF9feDg2X2luZGlyZWN0X3RodW5rX3IxMQoKRGVmaW5l IHRoZSBfX0NGSV9UWVBFIGhlbHBlciBtYWNybyBmb3IgbWFudWFsbHkgYW5ub3RhdGluZyBpbmRp cmVjdGx5CmNhbGxlZCBhc3NlbWJseSBmdW5jdGlvbiB3aXRoIHRoZSBpZGVudGljYWwgcHJlbWFi bGUsIGFkZCBlcnJvciBoYW5kbGluZwpjb2RlIGZvciB0aGUgdWQyIHRyYXBzIGVtaXR0ZWQgZm9y IGluZGlyZWN0IGNhbGwgY2hlY2tzLCBhbmQgYWxsb3cKQ09ORklHX0NGSV9DTEFORyB0byBiZSBz ZWxlY3RlZCBvbiB4ODZfNjQuCgpUaGlzIHByb2R1Y2VzIHRoZSBmb2xsb3dpbmcgb29wcyBvbiBD RkkgZmFpbHVyZSAoZ2VuZXJhdGVkIHVzaW5nIGxrZHRtKToKClsgICAyMS40NDE3MDZdIENGSSBm YWlsdXJlIGF0IGxrZHRtX2luZGlyZWN0X2NhbGwrMHgxNi8weDIwIFtsa2R0bV0KKHRhcmdldDog bGtkdG1faW5jcmVtZW50X2ludCsweDAvMHgxMCBbbGtkdG1dOyBleHBlY3RlZCB0eXBlOiAweDdl MGM1MmEpClsgICAyMS40NDQ1NzldIGludmFsaWQgb3Bjb2RlOiAwMDAwIFsjMV0gUFJFRU1QVCBT TVAgTk9QVEkKWyAgIDIxLjQ0NTI5Nl0gQ1BVOiAwIFBJRDogMTMyIENvbW06IHNoIE5vdCB0YWlu dGVkCjUuMTkuMC1yYzgtMDAwMjAtZzlmMjczNjBlNjc0YyAjMQpbICAgMjEuNDQ1Mjk2XSBIYXJk d2FyZSBuYW1lOiBRRU1VIFN0YW5kYXJkIFBDIChpNDQwRlggKyBQSUlYLCAxOTk2KSwKQklPUyBy ZWwtMS4xNC4wLTAtZzE1NTgyMWExOTkwYi1wcmVidWlsdC5xZW11Lm9yZyAwNC8wMS8yMDE0Clsg ICAyMS40NDUyOTZdIFJJUDogMDAxMDpsa2R0bV9pbmRpcmVjdF9jYWxsKzB4MTYvMHgyMCBbbGtk dG1dClsgICAyMS40NDUyOTZdIENvZGU6IDUyIDFjIGMwIDQ4IGM3IGMxIGM1IDUwIDFjIGMwIGU5 IDI1IDQ4IDJhIGNjIDBmIDFmCjQ0IDAwIDAwIDQ5IDg5IGZiIDQ4IGM3IGM3IDUwIGI0IDFjIGMw IDQxIGJhIDViIGFkIGYzIDgxIDQ1IDAzIDUzIGY4ClsgICAyMS40NDUyOTZdIFJTUDogMDAxODpm ZmZmYTlmOWMwMmZmZGMwIEVGTEFHUzogMDAwMDAyOTIKWyAgIDIxLjQ0NTI5Nl0gUkFYOiAwMDAw MDAwMDAwMDAwMDI3IFJCWDogZmZmZmZmZmZjMDFjYjMwMCBSQ1g6IDM4NWNiYmQyZTA3MGE3MDAK WyAgIDIxLjQ0NTI5Nl0gUkRYOiAwMDAwMDAwMDAwMDAwMDAwIFJTSTogYzAwMDAwMDBmZmZmZGZm ZiBSREk6IGZmZmZmZmZmYzAxY2I0NTAKWyAgIDIxLjQ0NTI5Nl0gUkJQOiAwMDAwMDAwMDAwMDAw MDA2IFIwODogMDAwMDAwMDAwMDAwMDAwMCBSMDk6IGZmZmZmZmZmOGQwODE2MTAKWyAgIDIxLjQ0 NTI5Nl0gUjEwOiAwMDAwMDAwMGJjYzkwODI1IFIxMTogZmZmZmZmZmZjMDFjMmZjMCBSMTI6IDAw MDAwMDAwMDAwMDAwMDAKWyAgIDIxLjQ0NTI5Nl0gUjEzOiBmZmZmYTMxYjgyN2E2MDAwIFIxNDog MDAwMDAwMDAwMDAwMDAwMCBSMTU6IDAwMDAwMDAwMDAwMDAwMDIKWyAgIDIxLjQ0NTI5Nl0gRlM6 ICAwMDAwN2YwOGI0MjIxNmEwKDAwMDApIEdTOmZmZmZhMzFiOWY0MDAwMDAoMDAwMCkKa25sR1M6 MDAwMDAwMDAwMDAwMDAwMApbICAgMjEuNDQ1Mjk2XSBDUzogIDAwMTAgRFM6IDAwMDAgRVM6IDAw MDAgQ1IwOiAwMDAwMDAwMDgwMDUwMDMzClsgICAyMS40NDUyOTZdIENSMjogMDAwMDAwMDAwMGM3 NjY3OCBDUjM6IDAwMDAwMDAwMDE5NDAwMDAgQ1I0OiAwMDAwMDAwMDAwMDAwNmYwClsgICAyMS40 NDUyOTZdIENhbGwgVHJhY2U6ClsgICAyMS40NDUyOTZdICA8VEFTSz4KWyAgIDIxLjQ0NTI5Nl0g IGxrZHRtX0NGSV9GT1JXQVJEX1BST1RPKzB4MzAvMHg1MCBbbGtkdG1dClsgICAyMS40NDUyOTZd ICBkaXJlY3RfZW50cnkrMHgxMmQvMHgxNDAgW2xrZHRtXQpbICAgMjEuNDQ1Mjk2XSAgZnVsbF9w cm94eV93cml0ZSsweDVkLzB4YjAKWyAgIDIxLjQ0NTI5Nl0gIHZmc193cml0ZSsweDE0NC8weDQ2 MApbICAgMjEuNDQ1Mjk2XSAgPyBfX3g2NF9zeXNfd2FpdDQrMHg1YS8weGMwClsgICAyMS40NDUy OTZdICBrc3lzX3dyaXRlKzB4NjkvMHhkMApbICAgMjEuNDQ1Mjk2XSAgZG9fc3lzY2FsbF82NCsw eDUxLzB4YTAKWyAgIDIxLjQ0NTI5Nl0gIGVudHJ5X1NZU0NBTExfNjRfYWZ0ZXJfaHdmcmFtZSsw eDYzLzB4Y2QKWyAgIDIxLjQ0NTI5Nl0gUklQOiAwMDMzOjB4N2YwOGI0MWE2ZmUxClsgICAyMS40 NDUyOTZdIENvZGU6IGJlIDA3IDAwIDAwIDAwIDQxIDg5IGMwIGU4IDdlIGZmIGZmIGZmIDQ0IDg5 IGM3IDg5CjA0IDI0IGU4IDkxIGM2IDAyIDAwIDhiIDA0IDI0IDQ4IDgzIGM0IDY4IGMzIDQ4IDYz IGZmIGI4IDAxIDAwIDAwIDAzClsgICAyMS40NDUyOTZdIFJTUDogMDAyYjowMDAwN2ZmY2RmNjVj MmU4IEVGTEFHUzogMDAwMDAyNDYgT1JJR19SQVg6IDAwMDAwMDAwMDAwMDAwMDEKWyAgIDIxLjQ0 NTI5Nl0gUkFYOiBmZmZmZmZmZmZmZmZmZmRhIFJCWDogMDAwMDdmMDhiNDIyMTY5MCBSQ1g6IDAw MDA3ZjA4YjQxYTZmZTEKWyAgIDIxLjQ0NTI5Nl0gUkRYOiAwMDAwMDAwMDAwMDAwMDEyIFJTSTog MDAwMDAwMDAwMGM3MzhmMCBSREk6IDAwMDAwMDAwMDAwMDAwMDEKWyAgIDIxLjQ0NTI5Nl0gUkJQ OiAwMDAwMDAwMDAwMDAwMDAxIFIwODogZmVmZWZlZmVmZWZlZmVmZiBSMDk6IGZlZmVmZWZlZmZj NWZmNGUKWyAgIDIxLjQ0NTI5Nl0gUjEwOiAwMDAwN2YwOGI0MjIyMmIwIFIxMTogMDAwMDAwMDAw MDAwMDI0NiBSMTI6IDAwMDAwMDAwMDBjNzM4ZjAKWyAgIDIxLjQ0NTI5Nl0gUjEzOiAwMDAwMDAw MDAwMDAwMDEyIFIxNDogMDAwMDdmZmNkZjY1YzQwMSBSMTU6IDAwMDAwMDAwMDBjNzA0NTAKWyAg IDIxLjQ0NTI5Nl0gIDwvVEFTSz4KWyAgIDIxLjQ0NTI5Nl0gTW9kdWxlcyBsaW5rZWQgaW46IGxr ZHRtClsgICAyMS40NDUyOTZdIER1bXBpbmcgZnRyYWNlIGJ1ZmZlcjoKWyAgIDIxLjQ0NTI5Nl0g ICAgKGZ0cmFjZSBidWZmZXIgZW1wdHkpClsgICAyMS40NzE0NDJdIC0tLVsgZW5kIHRyYWNlIDAw MDAwMDAwMDAwMDAwMDAgXS0tLQpbICAgMjEuNDcxODExXSBSSVA6IDAwMTA6bGtkdG1faW5kaXJl Y3RfY2FsbCsweDE2LzB4MjAgW2xrZHRtXQpbICAgMjEuNDcyNDY3XSBDb2RlOiA1MiAxYyBjMCA0 OCBjNyBjMSBjNSA1MCAxYyBjMCBlOSAyNSA0OCAyYSBjYyAwZiAxZgo0NCAwMCAwMCA0OSA4OSBm YiA0OCBjNyBjNyA1MCBiNCAxYyBjMCA0MSBiYSA1YiBhZCBmMyA4MSA0NSAwMyA1MyBmOApbICAg MjEuNDc0NDAwXSBSU1A6IDAwMTg6ZmZmZmE5ZjljMDJmZmRjMCBFRkxBR1M6IDAwMDAwMjkyClsg ICAyMS40NzQ3MzVdIFJBWDogMDAwMDAwMDAwMDAwMDAyNyBSQlg6IGZmZmZmZmZmYzAxY2IzMDAg UkNYOiAzODVjYmJkMmUwNzBhNzAwClsgICAyMS40NzU2NjRdIFJEWDogMDAwMDAwMDAwMDAwMDAw MCBSU0k6IGMwMDAwMDAwZmZmZmRmZmYgUkRJOiBmZmZmZmZmZmMwMWNiNDUwClsgICAyMS40NzY0 NzFdIFJCUDogMDAwMDAwMDAwMDAwMDAwNiBSMDg6IDAwMDAwMDAwMDAwMDAwMDAgUjA5OiBmZmZm ZmZmZjhkMDgxNjEwClsgICAyMS40NzcxMjddIFIxMDogMDAwMDAwMDBiY2M5MDgyNSBSMTE6IGZm ZmZmZmZmYzAxYzJmYzAgUjEyOiAwMDAwMDAwMDAwMDAwMDAwClsgICAyMS40Nzc5NTldIFIxMzog ZmZmZmEzMWI4MjdhNjAwMCBSMTQ6IDAwMDAwMDAwMDAwMDAwMDAgUjE1OiAwMDAwMDAwMDAwMDAw MDAyClsgICAyMS40Nzg2NTddIEZTOiAgMDAwMDdmMDhiNDIyMTZhMCgwMDAwKSBHUzpmZmZmYTMx YjlmNDAwMDAwKDAwMDApCmtubEdTOjAwMDAwMDAwMDAwMDAwMDAKWyAgIDIxLjQ3OTU3N10gQ1M6 ICAwMDEwIERTOiAwMDAwIEVTOiAwMDAwIENSMDogMDAwMDAwMDA4MDA1MDAzMwpbICAgMjEuNDgw MzA3XSBDUjI6IDAwMDAwMDAwMDBjNzY2NzggQ1IzOiAwMDAwMDAwMDAxOTQwMDAwIENSNDogMDAw MDAwMDAwMDAwMDZmMApbICAgMjEuNDgxNDYwXSBLZXJuZWwgcGFuaWMgLSBub3Qgc3luY2luZzog RmF0YWwgZXhjZXB0aW9uCgpTaWduZWQtb2ZmLWJ5OiBTYW1pIFRvbHZhbmVuIDxzYW1pdG9sdmFu ZW5AZ29vZ2xlLmNvbT4KLS0tCiBhcmNoL3g4Ni9LY29uZmlnICAgICAgICAgICAgICAgfCAgMiAr CiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9jZmkuaCAgICAgfCAyMiArKysrKysrKysKIGFyY2gveDg2 L2luY2x1ZGUvYXNtL2xpbmthZ2UuaCB8ICA5ICsrKysKIGFyY2gveDg2L2tlcm5lbC9NYWtlZmls ZSAgICAgICB8ICAyICsKIGFyY2gveDg2L2tlcm5lbC9jZmkuYyAgICAgICAgICB8IDg1ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGFyY2gveDg2L2tlcm5lbC90cmFwcy5jICAg ICAgICB8ICA0ICstCiA2IGZpbGVzIGNoYW5nZWQsIDEyMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgYXJjaC94ODYvaW5jbHVkZS9hc20vY2ZpLmgKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3g4Ni9rZXJuZWwvY2ZpLmMKCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni9LY29uZmlnIGIvYXJjaC94ODYvS2NvbmZpZwppbmRleCBmOTkyMGYxMzQxYzguLjFmZTZh ODNkYWMwNSAxMDA2NDQKLS0tIGEvYXJjaC94ODYvS2NvbmZpZworKysgYi9hcmNoL3g4Ni9LY29u ZmlnCkBAIC0xMDcsNiArMTA3LDggQEAgY29uZmlnIFg4NgogCXNlbGVjdCBBUkNIX1NVUFBPUlRT X1BBR0VfVEFCTEVfQ0hFQ0sJaWYgWDg2XzY0CiAJc2VsZWN0IEFSQ0hfU1VQUE9SVFNfTlVNQV9C QUxBTkNJTkcJaWYgWDg2XzY0CiAJc2VsZWN0IEFSQ0hfU1VQUE9SVFNfS01BUF9MT0NBTF9GT1JD RV9NQVAJaWYgTlJfQ1BVUyA8PSA0MDk2CisJc2VsZWN0IEFSQ0hfU1VQUE9SVFNfQ0ZJX0NMQU5H CQlpZiBYODZfNjQKKwlzZWxlY3QgQVJDSF9VU0VTX0NGSV9UUkFQUwkJaWYgWDg2XzY0ICYmIENG SV9DTEFORwogCXNlbGVjdCBBUkNIX1NVUFBPUlRTX0xUT19DTEFORwogCXNlbGVjdCBBUkNIX1NV UFBPUlRTX0xUT19DTEFOR19USElOCiAJc2VsZWN0IEFSQ0hfVVNFX0JVSUxUSU5fQlNXQVAKZGlm ZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL2NmaS5oIGIvYXJjaC94ODYvaW5jbHVkZS9h c20vY2ZpLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi41OGRhY2Q5 MGRhZWYKLS0tIC9kZXYvbnVsbAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9jZmkuaApAQCAt MCwwICsxLDIyIEBACisvKiBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCAqLworI2lm bmRlZiBfQVNNX1g4Nl9DRklfSAorI2RlZmluZSBfQVNNX1g4Nl9DRklfSAorCisvKgorICogQ2xh bmcgQ29udHJvbCBGbG93IEludGVncml0eSAoQ0ZJKSBzdXBwb3J0LgorICoKKyAqIENvcHlyaWdo dCAoQykgMjAyMiBHb29nbGUgTExDCisgKi8KKworI2luY2x1ZGUgPGxpbnV4L2NmaS5oPgorCisj aWZkZWYgQ09ORklHX0NGSV9DTEFORworZW51bSBidWdfdHJhcF90eXBlIGhhbmRsZV9jZmlfZmFp bHVyZShzdHJ1Y3QgcHRfcmVncyAqcmVncyk7CisjZWxzZQorc3RhdGljIGlubGluZSBlbnVtIGJ1 Z190cmFwX3R5cGUgaGFuZGxlX2NmaV9mYWlsdXJlKHN0cnVjdCBwdF9yZWdzICpyZWdzKQorewor CXJldHVybiBCVUdfVFJBUF9UWVBFX05PTkU7Cit9CisjZW5kaWYgLyogQ09ORklHX0NGSV9DTEFO RyAqLworCisjZW5kaWYgLyogX0FTTV9YODZfQ0ZJX0ggKi8KZGlmZiAtLWdpdCBhL2FyY2gveDg2 L2luY2x1ZGUvYXNtL2xpbmthZ2UuaCBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL2xpbmthZ2UuaApp bmRleCA3M2NhMjAwNDk4MzUuLmViZmEwNTk3MzMxMiAxMDA2NDQKLS0tIGEvYXJjaC94ODYvaW5j bHVkZS9hc20vbGlua2FnZS5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL2xpbmthZ2UuaApA QCAtMjksNiArMjksMTUgQEAKICNlbmRpZgogI2VuZGlmIC8qIENPTkZJR19SRVRQT0xJTkUgKi8K IAorI2lmZGVmIENPTkZJR19DRklfQ0xBTkcKKyNkZWZpbmUgX19DRklfVFlQRShuYW1lKQkJCQkJ XAorCVNZTV9TVEFSVChfX2NmaV8jI25hbWUsIFNZTV9MX0xPQ0FMLCBTWU1fQV9OT05FKQlcCisJ LmZpbGwgMTEsIDEsIDB4OTAgQVNNX05MCQkJCVwKKwkuYnl0ZSAweGI4IEFTTV9OTAkJCQkJXAor CS5sb25nIF9fa2NmaV90eXBlaWRfIyNuYW1lIEFTTV9OTAkJCVwKKwlTWU1fRlVOQ19FTkQoX19j ZmlfIyNuYW1lKQorI2VuZGlmCisKICNlbHNlIC8qIF9fQVNTRU1CTFlfXyAqLwogCiAjaWYgZGVm aW5lZChDT05GSUdfUkVUSFVOSykgJiYgIWRlZmluZWQoX19ESVNBQkxFX0VYUE9SVFMpICYmICFk ZWZpbmVkKEJVSUxEX1ZEU08pCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvTWFrZWZpbGUg Yi9hcmNoL3g4Ni9rZXJuZWwvTWFrZWZpbGUKaW5kZXggYTIwYTVlYmZhY2Q3Li4xMjg2YTczZWJk YmMgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9NYWtlZmlsZQorKysgYi9hcmNoL3g4Ni9r ZXJuZWwvTWFrZWZpbGUKQEAgLTEzOSw2ICsxMzksOCBAQCBvYmotJChDT05GSUdfVU5XSU5ERVJf R1VFU1MpCQkrPSB1bndpbmRfZ3Vlc3MubwogCiBvYmotJChDT05GSUdfQU1EX01FTV9FTkNSWVBU KQkJKz0gc2V2Lm8KIAorb2JqLSQoQ09ORklHX0NGSV9DTEFORykJCQkrPSBjZmkubworCiAjIyMK ICMgNjQgYml0IHNwZWNpZmljIGZpbGVzCiBpZmVxICgkKENPTkZJR19YODZfNjQpLHkpCmRpZmYg LS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvY2ZpLmMgYi9hcmNoL3g4Ni9rZXJuZWwvY2ZpLmMKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lNjQyYzFhZjI2NzgKLS0tIC9k ZXYvbnVsbAorKysgYi9hcmNoL3g4Ni9rZXJuZWwvY2ZpLmMKQEAgLTAsMCArMSw4NSBAQAorLy8g U1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjAKKy8qCisgKiBDbGFuZyBDb250cm9sIEZs b3cgSW50ZWdyaXR5IChDRkkpIHN1cHBvcnQuCisgKgorICogQ29weXJpZ2h0IChDKSAyMDIyIEdv b2dsZSBMTEMKKyAqLworI2luY2x1ZGUgPGFzbS9jZmkuaD4KKyNpbmNsdWRlIDxhc20vaW5zbi5o PgorI2luY2x1ZGUgPGFzbS9pbnNuLWV2YWwuaD4KKworLyoKKyAqIFJldHVybnMgdGhlIHRhcmdl dCBhZGRyZXNzIGFuZCB0aGUgZXhwZWN0ZWQgdHlwZSB3aGVuIHJlZ3MtPmlwIHBvaW50cworICog dG8gYSBjb21waWxlci1nZW5lcmF0ZWQgQ0ZJIHRyYXAuCisgKi8KK3N0YXRpYyBib29sIGRlY29k ZV9jZmlfaW5zbihzdHJ1Y3QgcHRfcmVncyAqcmVncywgdW5zaWduZWQgbG9uZyAqdGFyZ2V0LAor CQkJICAgIHUzMiAqdHlwZSkKK3sKKwljaGFyIGJ1ZmZlcltNQVhfSU5TTl9TSVpFXTsKKwlzdHJ1 Y3QgaW5zbiBpbnNuOworCWludCBvZmZzZXQgPSAwOworCisJKnRhcmdldCA9ICp0eXBlID0gMDsK KworCS8qCisJICogVGhlIGNvbXBpbGVyIGdlbmVyYXRlcyB0aGUgZm9sbG93aW5nIGluc3RydWN0 aW9uIHNlcXVlbmNlCisJICogZm9yIGluZGlyZWN0IGNhbGwgY2hlY2tzOgorCSAqCisJICogwqAg bW92bCAgICAtPGlkPiwgJXIxMGQgICAgICAgOyA2IGJ5dGVzCisJICogICBhZGRsICAgIC00KCVy ZWcpLCAlcjEwZCAgICA7IDQgYnl0ZXMKKwkgKiAgIGplICAgICAgLkx0bXAxICAgICAgICAgICAg IDsgMiBieXRlcworCSAqICAgdWQyICAgICAgICAgICAgICAgICAgICAgICAgOyA8LSByZWdzLT5p cAorCSAqICAgLkx0bXAxOgorCSAqCisJICogV2UgY2FuIGRlY29kZSB0aGUgZXhwZWN0ZWQgdHlw ZSBhbmQgdGhlIHRhcmdldCBhZGRyZXNzIGZyb20gdGhlCisJICogbW92bC9hZGRsIGluc3RydWN0 aW9ucy4KKwkgKi8KKwlpZiAoY29weV9mcm9tX2tlcm5lbF9ub2ZhdWx0KGJ1ZmZlciwgKHZvaWQg KilyZWdzLT5pcCAtIDEyLCBNQVhfSU5TTl9TSVpFKSkKKwkJcmV0dXJuIGZhbHNlOworCWlmIChp bnNuX2RlY29kZV9rZXJuZWwoJmluc24sICZidWZmZXJbb2Zmc2V0XSkpCisJCXJldHVybiBmYWxz ZTsKKwlpZiAoaW5zbi5vcGNvZGUudmFsdWUgIT0gMHhCQSkKKwkJcmV0dXJuIGZhbHNlOworCisJ KnR5cGUgPSAtKHUzMilpbnNuLmltbWVkaWF0ZS52YWx1ZTsKKworCWlmIChjb3B5X2Zyb21fa2Vy bmVsX25vZmF1bHQoYnVmZmVyLCAodm9pZCAqKXJlZ3MtPmlwIC0gNiwgTUFYX0lOU05fU0laRSkp CisJCXJldHVybiBmYWxzZTsKKwlpZiAoaW5zbl9kZWNvZGVfa2VybmVsKCZpbnNuLCAmYnVmZmVy W29mZnNldF0pKQorCQlyZXR1cm4gZmFsc2U7CisJaWYgKGluc24ub3Bjb2RlLnZhbHVlICE9IDB4 MykKKwkJcmV0dXJuIGZhbHNlOworCisJLyogUmVhZCB0aGUgdGFyZ2V0IGFkZHJlc3MgZnJvbSB0 aGUgcmVnaXN0ZXIuICovCisJb2Zmc2V0ID0gaW5zbl9nZXRfbW9kcm1fcm1fb2ZmKCZpbnNuLCBy ZWdzKTsKKwlpZiAob2Zmc2V0IDwgMCkKKwkJcmV0dXJuIGZhbHNlOworCisJKnRhcmdldCA9ICoo dW5zaWduZWQgbG9uZyAqKSgodm9pZCAqKXJlZ3MgKyBvZmZzZXQpOworCisJcmV0dXJuIHRydWU7 Cit9CisKKy8qCisgKiBDaGVja3MgaWYgYSB1ZDIgdHJhcCBpcyBiZWNhdXNlIG9mIGEgQ0ZJIGZh aWx1cmUsIGFuZCBoYW5kbGVzIHRoZSB0cmFwCisgKiBpZiBuZWVkZWQuIFJldHVybnMgYSBidWdf dHJhcF90eXBlIHZhbHVlIHNpbWlsYXJseSB0byByZXBvcnRfYnVnLgorICovCitlbnVtIGJ1Z190 cmFwX3R5cGUgaGFuZGxlX2NmaV9mYWlsdXJlKHN0cnVjdCBwdF9yZWdzICpyZWdzKQoreworCXVu c2lnbmVkIGxvbmcgdGFyZ2V0OworCXUzMiB0eXBlOworCisJaWYgKCFpc19jZmlfdHJhcChyZWdz LT5pcCkpCisJCXJldHVybiBCVUdfVFJBUF9UWVBFX05PTkU7CisKKwlpZiAoIWRlY29kZV9jZmlf aW5zbihyZWdzLCAmdGFyZ2V0LCAmdHlwZSkpCisJCXJldHVybiByZXBvcnRfY2ZpX2ZhaWx1cmVf bm9hZGRyKHJlZ3MsIHJlZ3MtPmlwKTsKKworCXJldHVybiByZXBvcnRfY2ZpX2ZhaWx1cmUocmVn cywgcmVncy0+aXAsICZ0YXJnZXQsIHR5cGUpOworfQorCisvKgorICogRW5zdXJlIHRoYXQgX19r Y2ZpX3R5cGVpZF8gc3ltYm9scyBhcmUgZW1pdHRlZCBmb3IgZnVuY3Rpb25zIHRoYXQgbWF5Cisg KiBub3QgYmUgaW5kaXJlY3RseSBjYWxsZWQgd2l0aCBhbGwgY29uZmlndXJhdGlvbnMuCisgKi8K K19fQUREUkVTU0FCTEUobWVtY3B5KQpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL3RyYXBz LmMgYi9hcmNoL3g4Ni9rZXJuZWwvdHJhcHMuYwppbmRleCBkNjJiMmNiODVjZWEuLjE3ODAxNWE4 MjBmMCAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL3RyYXBzLmMKKysrIGIvYXJjaC94ODYv a2VybmVsL3RyYXBzLmMKQEAgLTYzLDYgKzYzLDcgQEAKICNpbmNsdWRlIDxhc20vaW5zbi1ldmFs Lmg+CiAjaW5jbHVkZSA8YXNtL3Zkc28uaD4KICNpbmNsdWRlIDxhc20vdGR4Lmg+CisjaW5jbHVk ZSA8YXNtL2NmaS5oPgogCiAjaWZkZWYgQ09ORklHX1g4Nl82NAogI2luY2x1ZGUgPGFzbS94ODZf aW5pdC5oPgpAQCAtMzEzLDcgKzMxNCw4IEBAIHN0YXRpYyBub2luc3RyIGJvb2wgaGFuZGxlX2J1 ZyhzdHJ1Y3QgcHRfcmVncyAqcmVncykKIAkgKi8KIAlpZiAocmVncy0+ZmxhZ3MgJiBYODZfRUZM QUdTX0lGKQogCQlyYXdfbG9jYWxfaXJxX2VuYWJsZSgpOwotCWlmIChyZXBvcnRfYnVnKHJlZ3Mt PmlwLCByZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4pIHsKKwlpZiAocmVwb3J0X2J1ZyhyZWdz LT5pcCwgcmVncykgPT0gQlVHX1RSQVBfVFlQRV9XQVJOIHx8CisJICAgIGhhbmRsZV9jZmlfZmFp bHVyZShyZWdzKSA9PSBCVUdfVFJBUF9UWVBFX1dBUk4pIHsKIAkJcmVncy0+aXAgKz0gTEVOX1VE MjsKIAkJaGFuZGxlZCA9IHRydWU7CiAJfQotLSAKMi4zNy4yLjY3Mi5nOTQ3NjlkMDZmMC1nb29n CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgt YXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJt LWtlcm5lbAo=