2018-01-06 17:13:39 +03:00
|
|
|
From 6f359bcacdf28ca9f6bfc29bd0aa4e22489eb34d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
|
|
|
Date: Mon, 18 Sep 2017 21:43:35 -0500
|
2018-01-08 12:25:09 +03:00
|
|
|
Subject: [PATCH 057/241] x86/xen: Fix xen head ELF annotations
|
2018-01-06 17:13:39 +03:00
|
|
|
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 <jpoimboe@redhat.com>
|
|
|
|
|
Cc: Andy Lutomirski <luto@kernel.org>
|
|
|
|
|
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
|
|
|
|
Cc: Jiri Slaby <jslaby@suse.cz>
|
|
|
|
|
Cc: Juergen Gross <jgross@suse.com>
|
|
|
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
|
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
|
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
Link: http://lkml.kernel.org/r/3a80a394d30af43d9cefa1a29628c45ed8420c97.1505764066.git.jpoimboe@redhat.com
|
|
|
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
|
|
|
(cherry picked from commit 2582d3df95c76d3b686453baf90b64d57e87d1e8)
|
|
|
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
|
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
|
|
|
(cherry picked from commit b9410861f1436c1e38958a9b85009ad252aad9f5)
|
|
|
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
|
|
|
---
|
|
|
|
|
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
|
|
|
|
|
|
