]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0055-x86-head-Fix-head-ELF-function-annotations.patch
KPTI: add follow-up fixes
[pve-kernel.git] / patches / kernel / 0055-x86-head-Fix-head-ELF-function-annotations.patch
1 From 2527d40adb84012c90cab350bd5ebbce65daaff7 Mon Sep 17 00:00:00 2001
2 From: Josh Poimboeuf <jpoimboe@redhat.com>
3 Date: Mon, 18 Sep 2017 21:43:33 -0500
4 Subject: [PATCH 055/241] x86/head: Fix head ELF function annotations
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 These functions aren't callable C-type functions, so don't annotate them
12 as such.
13
14 Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
15 Cc: Andy Lutomirski <luto@kernel.org>
16 Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
17 Cc: Jiri Slaby <jslaby@suse.cz>
18 Cc: Juergen Gross <jgross@suse.com>
19 Cc: Linus Torvalds <torvalds@linux-foundation.org>
20 Cc: Peter Zijlstra <peterz@infradead.org>
21 Cc: Thomas Gleixner <tglx@linutronix.de>
22 Link: http://lkml.kernel.org/r/36eb182738c28514f8bf95e403d89b6413a88883.1505764066.git.jpoimboe@redhat.com
23 Signed-off-by: Ingo Molnar <mingo@kernel.org>
24 (cherry picked from commit 015a2ea5478680fc5216d56b7ff306f2a74efaf9)
25 Signed-off-by: Andy Whitcroft <apw@canonical.com>
26 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
27 (cherry picked from commit 707517a56928fed1c03eefdb4e00fa57dfddc4fd)
28 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
29 ---
30 arch/x86/kernel/head_64.S | 6 +++---
31 1 file changed, 3 insertions(+), 3 deletions(-)
32
33 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
34 index 37d9905d38d6..45b18b1a6417 100644
35 --- a/arch/x86/kernel/head_64.S
36 +++ b/arch/x86/kernel/head_64.S
37 @@ -218,7 +218,7 @@ ENTRY(secondary_startup_64)
38 pushq %rax # target address in negative space
39 lretq
40 .Lafter_lret:
41 -ENDPROC(secondary_startup_64)
42 +END(secondary_startup_64)
43
44 #include "verify_cpu.S"
45
46 @@ -261,7 +261,7 @@ ENTRY(early_idt_handler_array)
47 i = i + 1
48 .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc
49 .endr
50 -ENDPROC(early_idt_handler_array)
51 +END(early_idt_handler_array)
52
53 early_idt_handler_common:
54 /*
55 @@ -304,7 +304,7 @@ early_idt_handler_common:
56 20:
57 decl early_recursion_flag(%rip)
58 jmp restore_regs_and_iret
59 -ENDPROC(early_idt_handler_common)
60 +END(early_idt_handler_common)
61
62 __INITDATA
63
64 --
65 2.14.2
66