projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 321d628a FG |
1 | From 0f8a85764c86b5ce79e22969f87b2da087b05729 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Gleixner <tglx@linutronix.de> | |
| 3 | Date: Mon, 4 Dec 2017 15:07:30 +0100 | |
| e4cdf2a5 | 4 | Subject: [PATCH 160/241] x86/paravirt: Dont patch flush_tlb_single |
| 321d628a FG |
5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | CVE-2017-5754 | |
| 10 | ||
| 11 | native_flush_tlb_single() will be changed with the upcoming | |
| 12 | PAGE_TABLE_ISOLATION feature. This requires to have more code in | |
| 13 | there than INVLPG. | |
| 14 | ||
| 15 | Remove the paravirt patching for it. | |
| 16 | ||
| 17 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | |
| 18 | Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com> | |
| 19 | Reviewed-by: Juergen Gross <jgross@suse.com> | |
| 20 | Acked-by: Peter Zijlstra <peterz@infradead.org> | |
| 21 | Cc: Andy Lutomirski <luto@kernel.org> | |
| 22 | Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> | |
| 23 | Cc: Borislav Petkov <bp@alien8.de> | |
| 24 | Cc: Borislav Petkov <bpetkov@suse.de> | |
| 25 | Cc: Brian Gerst <brgerst@gmail.com> | |
| 26 | Cc: Dave Hansen <dave.hansen@intel.com> | |
| 27 | Cc: Dave Hansen <dave.hansen@linux.intel.com> | |
| 28 | Cc: David Laight <David.Laight@aculab.com> | |
| 29 | Cc: Denys Vlasenko <dvlasenk@redhat.com> | |
| 30 | Cc: Eduardo Valentin <eduval@amazon.com> | |
| 31 | Cc: Greg KH <gregkh@linuxfoundation.org> | |
| 32 | Cc: H. Peter Anvin <hpa@zytor.com> | |
| 33 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 34 | Cc: Rik van Riel <riel@redhat.com> | |
| 35 | Cc: Will Deacon <will.deacon@arm.com> | |
| 36 | Cc: aliguori@amazon.com | |
| 37 | Cc: daniel.gruss@iaik.tugraz.at | |
| 38 | Cc: hughd@google.com | |
| 39 | Cc: keescook@google.com | |
| 40 | Cc: linux-mm@kvack.org | |
| 41 | Cc: michael.schwarz@iaik.tugraz.at | |
| 42 | Cc: moritz.lipp@iaik.tugraz.at | |
| 43 | Cc: richard.fellner@student.tugraz.at | |
| 44 | Link: https://lkml.kernel.org/r/20171204150606.828111617@linutronix.de | |
| 45 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
| 46 | (cherry picked from commit a035795499ca1c2bd1928808d1a156eda1420383) | |
| 47 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
| 48 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
| 49 | (cherry picked from commit 435d79a109b8c04d76a6cdb32b9b49a262f75e61) | |
| 50 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 51 | --- | |
| 52 | arch/x86/kernel/paravirt_patch_64.c | 2 -- | |
| 53 | 1 file changed, 2 deletions(-) | |
| 54 | ||
| 55 | diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c | |
| 56 | index 11aaf1eaa0e4..c354833342bd 100644 | |
| 57 | --- a/arch/x86/kernel/paravirt_patch_64.c | |
| 58 | +++ b/arch/x86/kernel/paravirt_patch_64.c | |
| 59 | @@ -9,7 +9,6 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax"); | |
| 60 | DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax"); | |
| 61 | DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax"); | |
| 62 | DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3"); | |
| 63 | -DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)"); | |
| 64 | DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd"); | |
| 65 | ||
| 66 | DEF_NATIVE(pv_cpu_ops, usergs_sysret64, "swapgs; sysretq"); | |
| 67 | @@ -59,7 +58,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, | |
| 68 | PATCH_SITE(pv_mmu_ops, read_cr2); | |
| 69 | PATCH_SITE(pv_mmu_ops, read_cr3); | |
| 70 | PATCH_SITE(pv_mmu_ops, write_cr3); | |
| 71 | - PATCH_SITE(pv_mmu_ops, flush_tlb_single); | |
| 72 | PATCH_SITE(pv_cpu_ops, wbinvd); | |
| 73 | #if defined(CONFIG_PARAVIRT_SPINLOCKS) | |
| 74 | case PARAVIRT_PATCH(pv_lock_ops.queued_spin_unlock): | |
| 75 | -- | |
| 76 | 2.14.2 | |
| 77 |