]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0171-x86-mm-64-Improve-the-memory-map-documentation.patch
KPTI: add follow-up fixes
[pve-kernel.git] / patches / kernel / 0171-x86-mm-64-Improve-the-memory-map-documentation.patch
1 From fd143ce57a7cfaf015f1c0274b9f071f4046696a Mon Sep 17 00:00:00 2001
2 From: Andy Lutomirski <luto@kernel.org>
3 Date: Tue, 12 Dec 2017 07:56:43 -0800
4 Subject: [PATCH 171/241] x86/mm/64: Improve the memory map documentation
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 The old docs had the vsyscall range wrong and were missing the fixmap.
12 Fix both.
13
14 There used to be 8 MB reserved for future vsyscalls, but that's long gone.
15
16 Signed-off-by: Andy Lutomirski <luto@kernel.org>
17 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
18 Cc: Borislav Petkov <bp@alien8.de>
19 Cc: Brian Gerst <brgerst@gmail.com>
20 Cc: Dave Hansen <dave.hansen@intel.com>
21 Cc: Dave Hansen <dave.hansen@linux.intel.com>
22 Cc: David Laight <David.Laight@aculab.com>
23 Cc: H. Peter Anvin <hpa@zytor.com>
24 Cc: Josh Poimboeuf <jpoimboe@redhat.com>
25 Cc: Juergen Gross <jgross@suse.com>
26 Cc: Kees Cook <keescook@chromium.org>
27 Cc: Kirill A. Shutemov <kirill@shutemov.name>
28 Cc: Linus Torvalds <torvalds@linux-foundation.org>
29 Cc: Peter Zijlstra <peterz@infradead.org>
30 Signed-off-by: Ingo Molnar <mingo@kernel.org>
31 (cherry picked from commit 5a7ccf4754fb3660569a6de52ba7f7fc3dfaf280)
32 Signed-off-by: Andy Whitcroft <apw@canonical.com>
33 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
34 (cherry picked from commit d694898656126d8a04e86f681c8fe34ea57f1b85)
35 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
36 ---
37 Documentation/x86/x86_64/mm.txt | 10 ++++++----
38 1 file changed, 6 insertions(+), 4 deletions(-)
39
40 diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt
41 index 3448e675b462..83ca5a3b90ac 100644
42 --- a/Documentation/x86/x86_64/mm.txt
43 +++ b/Documentation/x86/x86_64/mm.txt
44 @@ -19,8 +19,9 @@ ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
45 ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
46 ... unused hole ...
47 ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0
48 -ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space (variable)
49 -ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls
50 +ffffffffa0000000 - [fixmap start] (~1526 MB) module mapping space (variable)
51 +[fixmap start] - ffffffffff5fffff kernel-internal fixmap range
52 +ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
53 ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
54
55 Virtual memory map with 5 level page tables:
56 @@ -41,8 +42,9 @@ ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
57 ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
58 ... unused hole ...
59 ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0
60 -ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space
61 -ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls
62 +ffffffffa0000000 - [fixmap start] (~1526 MB) module mapping space
63 +[fixmap start] - ffffffffff5fffff kernel-internal fixmap range
64 +ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
65 ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
66
67 Architecture defines a 64-bit virtual address. Implementations can support
68 --
69 2.14.2
70