]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0053-x86-head-Remove-confusing-comment.patch
KPTI: add follow-up fixes
[pve-kernel.git] / patches / kernel / 0053-x86-head-Remove-confusing-comment.patch
1 From 109bbd8c905806e929b67ca0b2eaf57ff88f10c1 Mon Sep 17 00:00:00 2001
2 From: Josh Poimboeuf <jpoimboe@redhat.com>
3 Date: Mon, 18 Sep 2017 21:43:31 -0500
4 Subject: [PATCH 053/241] x86/head: Remove confusing comment
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 This comment is actively wrong and confusing. It refers to the
12 registers' stack offsets after the pt_regs has been constructed on the
13 stack, but this code is *before* that.
14
15 At this point the stack just has the standard iret frame, for which no
16 comment should be needed.
17
18 Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
19 Cc: Andy Lutomirski <luto@kernel.org>
20 Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
21 Cc: Jiri Slaby <jslaby@suse.cz>
22 Cc: Juergen Gross <jgross@suse.com>
23 Cc: Linus Torvalds <torvalds@linux-foundation.org>
24 Cc: Peter Zijlstra <peterz@infradead.org>
25 Cc: Thomas Gleixner <tglx@linutronix.de>
26 Link: http://lkml.kernel.org/r/a3c267b770fc56c9b86df9c11c552848248aace2.1505764066.git.jpoimboe@redhat.com
27 Signed-off-by: Ingo Molnar <mingo@kernel.org>
28 (cherry picked from commit 17270717e80de33a884ad328fea5f407d87f6d6a)
29 Signed-off-by: Andy Whitcroft <apw@canonical.com>
30 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
31 (cherry picked from commit 49187e0108184688304260a75d29b789f36f3a2b)
32 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
33 ---
34 arch/x86/kernel/head_64.S | 4 ----
35 1 file changed, 4 deletions(-)
36
37 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
38 index 6225550883df..627c798b2f15 100644
39 --- a/arch/x86/kernel/head_64.S
40 +++ b/arch/x86/kernel/head_64.S
41 @@ -254,10 +254,6 @@ bad_address:
42
43 __INIT
44 ENTRY(early_idt_handler_array)
45 - # 104(%rsp) %rflags
46 - # 96(%rsp) %cs
47 - # 88(%rsp) %rip
48 - # 80(%rsp) error code
49 i = 0
50 .rept NUM_EXCEPTION_VECTORS
51 .ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1
52 --
53 2.14.2
54