lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 12 Mar 2018 03:03:34 +0000 From: Ben Hutchings <ben@...adent.org.uk> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org CC: akpm@...ux-foundation.org, "Paul Turner" <pjt@...gle.com>, "Linus Torvalds" <torvalds@...ux-foundation.org>, "Peter Zijlstra" <peterz@...radead.org>, gnomes@...rguk.ukuu.org.uk, "Tim Chen" <tim.c.chen@...ux.intel.com>, "Ingo Molnar" <mingo@...nel.org>, "David Woodhouse" <dwmw@...zon.co.uk>, "Andi Kleen" <ak@...ux.intel.com>, "Rik van Riel" <riel@...hat.com>, "Juergen Gross" <jgross@...e.com>, "Thomas Gleixner" <tglx@...utronix.de>, "Dave Hansen" <dave.hansen@...el.com>, "Greg Kroah-Hartman" <gregkh@...ux-foundation.org>, "Jiri Kosina" <jikos@...nel.org>, "Josh Poimboeuf" <jpoimboe@...hat.com>, "Andy Lutomirski" <luto@...capital.net>, thomas.lendacky@....com, "Kees Cook" <keescook@...gle.com>, "Arjan van de Ven" <arjan@...ux.intel.com> Subject: [PATCH 3.2 063/104] x86/retpoline/xen: Convert Xen hypercall indirect jumps 3.2.101-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: David Woodhouse <dwmw@...zon.co.uk> commit ea08816d5b185ab3d09e95e393f265af54560350 upstream. Convert indirect call in Xen hypercall to use non-speculative sequence, when CONFIG_RETPOLINE is enabled. Signed-off-by: David Woodhouse <dwmw@...zon.co.uk> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Acked-by: Arjan van de Ven <arjan@...ux.intel.com> Acked-by: Ingo Molnar <mingo@...nel.org> Reviewed-by: Juergen Gross <jgross@...e.com> Cc: gnomes@...rguk.ukuu.org.uk Cc: Rik van Riel <riel@...hat.com> Cc: Andi Kleen <ak@...ux.intel.com> Cc: Josh Poimboeuf <jpoimboe@...hat.com> Cc: thomas.lendacky@....com Cc: Peter Zijlstra <peterz@...radead.org> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Jiri Kosina <jikos@...nel.org> Cc: Andy Lutomirski <luto@...capital.net> Cc: Dave Hansen <dave.hansen@...el.com> Cc: Kees Cook <keescook@...gle.com> Cc: Tim Chen <tim.c.chen@...ux.intel.com> Cc: Greg Kroah-Hartman <gregkh@...ux-foundation.org> Cc: Paul Turner <pjt@...gle.com> Link: https://lkml.kernel.org/r/1515707194-20531-10-git-send-email-dwmw@amazon.co.uk [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@...adent.org.uk> --- arch/x86/include/asm/xen/hypercall.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -43,6 +43,7 @@ #include <asm/page.h> #include <asm/pgtable.h> +#include <asm/nospec-branch.h> #include <xen/interface/xen.h> #include <xen/interface/sched.h> @@ -212,9 +213,9 @@ privcmd_call(unsigned call, __HYPERCALL_DECLS; __HYPERCALL_5ARG(a1, a2, a3, a4, a5); - asm volatile("call *%[call]" + asm volatile(CALL_NOSPEC : __HYPERCALL_5PARAM - : [call] "a" (&hypercall_page[call]) + : [thunk_target] "a" (&hypercall_page[call]) : __HYPERCALL_CLOBBER5); return (long)__res;
Powered by blists - more mailing lists