| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- From 6f359bcacdf28ca9f6bfc29bd0aa4e22489eb34d Mon Sep 17 00:00:00 2001
- From: Josh Poimboeuf <[email protected]>
- Date: Mon, 18 Sep 2017 21:43:35 -0500
- Subject: [PATCH 057/242] x86/xen: Fix xen head ELF annotations
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- CVE-2017-5754
- Mark the ends of the startup_xen and hypercall_page code sections.
- Signed-off-by: Josh Poimboeuf <[email protected]>
- Cc: Andy Lutomirski <[email protected]>
- Cc: Boris Ostrovsky <[email protected]>
- Cc: Jiri Slaby <[email protected]>
- Cc: Juergen Gross <[email protected]>
- Cc: Linus Torvalds <[email protected]>
- Cc: Peter Zijlstra <[email protected]>
- Cc: Thomas Gleixner <[email protected]>
- Link: http://lkml.kernel.org/r/3a80a394d30af43d9cefa1a29628c45ed8420c97.1505764066.git.jpoimboe@redhat.com
- Signed-off-by: Ingo Molnar <[email protected]>
- (cherry picked from commit 2582d3df95c76d3b686453baf90b64d57e87d1e8)
- Signed-off-by: Andy Whitcroft <[email protected]>
- Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
- (cherry picked from commit b9410861f1436c1e38958a9b85009ad252aad9f5)
- Signed-off-by: Fabian Grünbichler <[email protected]>
- ---
- arch/x86/xen/xen-head.S | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
- index 72a8e6adebe6..2f0cff2cc265 100644
- --- a/arch/x86/xen/xen-head.S
- +++ b/arch/x86/xen/xen-head.S
- @@ -33,7 +33,7 @@ ENTRY(startup_xen)
- mov $init_thread_union+THREAD_SIZE, %_ASM_SP
-
- jmp xen_start_kernel
- -
- +END(startup_xen)
- __FINIT
- #endif
-
- @@ -47,7 +47,7 @@ ENTRY(hypercall_page)
- .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32
- #include <asm/xen-hypercalls.h>
- #undef HYPERCALL
- -
- +END(hypercall_page)
- .popsection
-
- ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux")
- --
- 2.14.2
|
