patches/kernel/0299-UBUNTU-SAUCE-x86-kvm-Fix-stuff_RSB-for-32-bit.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: William Grant <wgrant@ubuntu.com>
   3 Date: Thu, 11 Jan 2018 17:05:42 -0600
   4 Subject: [PATCH] UBUNTU: SAUCE: x86/kvm: Fix stuff_RSB() for 32-bit
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 CVE-2017-5753
  10 CVE-2017-5715
  11
  12 Signed-off-by: William Grant <wgrant@ubuntu.com>
  13 Acked-by: Kamal Mostafa <kamal@canonical.com>
  14 Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
  15 (cherry picked from commit 306dada4f850bf537dbd8ff06cf1522074b3f327)
  16 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  17 ---
  18  arch/x86/include/asm/kvm_host.h | 10 +++++++---
  19  1 file changed, 7 insertions(+), 3 deletions(-)
  20
  21 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
  22 index 4117a97228a2..f39bc68efa56 100644
  23 --- a/arch/x86/include/asm/kvm_host.h
  24 +++ b/arch/x86/include/asm/kvm_host.h
  25 @@ -223,9 +223,13 @@ static inline void stuff_RSB(void)
  26  .label31:      \n\
  27         call .label32   \n\
  28         pause   \n\
  29 -.label32: \n\
  30 -       add $(32*8), %%rsp      \n\
  31 -": : :"memory");
  32 +.label32: \n"
  33 +#ifdef CONFIG_X86_64
  34 +"      add $(32*8), %%rsp      \n"
  35 +#else
  36 +"      add $(32*4), %%esp      \n"
  37 +#endif
  38 +: : :"memory");
  39  }
  40
  41  enum kvm_reg {
  42 --
  43 2.14.2
  44