]>
Commit | Line | Data |
---|---|---|
321d628a FG |
1 | From 23e04cdf533d255ec9b5bb58229b6785b17fd3f1 Mon Sep 17 00:00:00 2001 |
2 | From: Peter Zijlstra <peterz@infradead.org> | |
3 | Date: Tue, 5 Dec 2017 13:34:49 +0100 | |
b378f209 | 4 | Subject: [PATCH 176/233] x86/mm: Use __flush_tlb_one() for kernel memory |
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 | __flush_tlb_single() is for user mappings, __flush_tlb_one() for | |
12 | kernel mappings. | |
13 | ||
14 | Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> | |
15 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | |
16 | Cc: Andy Lutomirski <luto@kernel.org> | |
17 | Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> | |
18 | Cc: Borislav Petkov <bp@alien8.de> | |
19 | Cc: Brian Gerst <brgerst@gmail.com> | |
20 | Cc: Dave Hansen <dave.hansen@linux.intel.com> | |
21 | Cc: David Laight <David.Laight@aculab.com> | |
22 | Cc: Denys Vlasenko <dvlasenk@redhat.com> | |
23 | Cc: Eduardo Valentin <eduval@amazon.com> | |
24 | Cc: Greg KH <gregkh@linuxfoundation.org> | |
25 | Cc: H. Peter Anvin <hpa@zytor.com> | |
26 | Cc: Josh Poimboeuf <jpoimboe@redhat.com> | |
27 | Cc: Juergen Gross <jgross@suse.com> | |
28 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
29 | Cc: Peter Zijlstra <peterz@infradead.org> | |
30 | Cc: Will Deacon <will.deacon@arm.com> | |
31 | Cc: aliguori@amazon.com | |
32 | Cc: daniel.gruss@iaik.tugraz.at | |
33 | Cc: hughd@google.com | |
34 | Cc: keescook@google.com | |
35 | Cc: linux-mm@kvack.org | |
36 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
37 | (cherry picked from commit a501686b2923ce6f2ff2b1d0d50682c6411baf72) | |
38 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
39 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
40 | (cherry picked from commit 9d23f46143933cd29576b6aa2b1827f3f39b9cf8) | |
41 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
42 | --- | |
43 | arch/x86/mm/tlb.c | 2 +- | |
44 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
45 | ||
46 | diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c | |
47 | index ed06f1593390..5b4342c5039c 100644 | |
48 | --- a/arch/x86/mm/tlb.c | |
49 | +++ b/arch/x86/mm/tlb.c | |
50 | @@ -546,7 +546,7 @@ static void do_kernel_range_flush(void *info) | |
51 | ||
52 | /* flush range by one by one 'invlpg' */ | |
53 | for (addr = f->start; addr < f->end; addr += PAGE_SIZE) | |
54 | - __flush_tlb_single(addr); | |
55 | + __flush_tlb_one(addr); | |
56 | } | |
57 | ||
58 | void flush_tlb_kernel_range(unsigned long start, unsigned long end) | |
59 | -- | |
60 | 2.14.2 | |
61 |