projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 59d5af67 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 321d628a FG |
2 | From: Josh Poimboeuf <jpoimboe@redhat.com> |
| 3 | Date: Mon, 18 Sep 2017 21:43:35 -0500 | |
| 59d5af67 | 4 | Subject: [PATCH] x86/xen: Fix xen head ELF annotations |
| 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 | Mark the ends of the startup_xen and hypercall_page code sections. | |
| 12 | ||
| 13 | Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> | |
| 14 | Cc: Andy Lutomirski <luto@kernel.org> | |
| 15 | Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> | |
| 16 | Cc: Jiri Slaby <jslaby@suse.cz> | |
| 17 | Cc: Juergen Gross <jgross@suse.com> | |
| 18 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 19 | Cc: Peter Zijlstra <peterz@infradead.org> | |
| 20 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
| 21 | Link: http://lkml.kernel.org/r/3a80a394d30af43d9cefa1a29628c45ed8420c97.1505764066.git.jpoimboe@redhat.com | |
| 22 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
| 23 | (cherry picked from commit 2582d3df95c76d3b686453baf90b64d57e87d1e8) | |
| 24 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
| 25 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
| 26 | (cherry picked from commit b9410861f1436c1e38958a9b85009ad252aad9f5) | |
| 27 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 28 | --- | |
| 29 | arch/x86/xen/xen-head.S | 4 ++-- | |
| 30 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 31 | ||
| 32 | diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S | |
| 33 | index 72a8e6adebe6..2f0cff2cc265 100644 | |
| 34 | --- a/arch/x86/xen/xen-head.S | |
| 35 | +++ b/arch/x86/xen/xen-head.S | |
| 36 | @@ -33,7 +33,7 @@ ENTRY(startup_xen) | |
| 37 | mov $init_thread_union+THREAD_SIZE, %_ASM_SP | |
| 38 | ||
| 39 | jmp xen_start_kernel | |
| 40 | - | |
| 41 | +END(startup_xen) | |
| 42 | __FINIT | |
| 43 | #endif | |
| 44 | ||
| 45 | @@ -47,7 +47,7 @@ ENTRY(hypercall_page) | |
| 46 | .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32 | |
| 47 | #include <asm/xen-hypercalls.h> | |
| 48 | #undef HYPERCALL | |
| 49 | - | |
| 50 | +END(hypercall_page) | |
| 51 | .popsection | |
| 52 | ||
| 53 | ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") | |
| 54 | -- | |
| 55 | 2.14.2 | |
| 56 |