patches/kernel/0056-x86-boot-Annotate-verify_cpu-as-a-callable-function.patch

   1 From 1b9783c7335f17e3f5bdb8776dd06de62dcfba81 Mon Sep 17 00:00:00 2001
   2 From: Josh Poimboeuf <jpoimboe@redhat.com>
   3 Date: Mon, 18 Sep 2017 21:43:34 -0500
   4 Subject: [PATCH 056/241] x86/boot: Annotate verify_cpu() as a callable
   5  function
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 CVE-2017-5754
  11
  12 verify_cpu() is a callable function.  Annotate it as such.
  13
  14 Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
  15 Cc: Andy Lutomirski <luto@kernel.org>
  16 Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
  17 Cc: Jiri Slaby <jslaby@suse.cz>
  18 Cc: Juergen Gross <jgross@suse.com>
  19 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  20 Cc: Peter Zijlstra <peterz@infradead.org>
  21 Cc: Thomas Gleixner <tglx@linutronix.de>
  22 Link: http://lkml.kernel.org/r/293024b8a080832075312f38c07ccc970fc70292.1505764066.git.jpoimboe@redhat.com
  23 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  24 (cherry picked from commit e93db75a0054b23a874a12c63376753544f3fe9e)
  25 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  26 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  27 (cherry picked from commit 48a432c46026f864e194cdf9a8133e7c9109274e)
  28 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  29 ---
  30  arch/x86/kernel/verify_cpu.S | 3 ++-
  31  1 file changed, 2 insertions(+), 1 deletion(-)
  32
  33 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
  34 index 014ea59aa153..3d3c2f71f617 100644
  35 --- a/arch/x86/kernel/verify_cpu.S
  36 +++ b/arch/x86/kernel/verify_cpu.S
  37 @@ -33,7 +33,7 @@
  38  #include <asm/cpufeatures.h>
  39  #include <asm/msr-index.h>
  40
  41 -verify_cpu:
  42 +ENTRY(verify_cpu)
  43         pushf                           # Save caller passed flags
  44         push    $0                      # Kill any dangerous flags
  45         popf
  46 @@ -139,3 +139,4 @@ verify_cpu:
  47         popf                            # Restore caller passed flags
  48         xorl %eax, %eax
  49         ret
  50 +ENDPROC(verify_cpu)
  51 --
  52 2.14.2
  53