patches/kernel/0132-tools-headers-Sync-objtool-UAPI-header.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Ingo Molnar <mingo@kernel.org>
   3 Date: Tue, 14 Nov 2017 07:24:22 +0100
   4 Subject: [PATCH] tools/headers: Sync objtool UAPI header
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 CVE-2017-5754
  10
  11 objtool grew this new warning:
  12
  13   Warning: synced file at 'tools/objtool/arch/x86/include/asm/inat.h' differs from latest kernel version at 'arch/x86/include/asm/inat.h'
  14
  15 which upstream header grew new INAT_SEG_* definitions.
  16
  17 Sync up the tooling version of the header.
  18
  19 Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
  20 Cc: Josh Poimboeuf <jpoimboe@redhat.com>
  21 Cc: Peter Zijlstra <peterz@infradead.org>
  22 Cc: Thomas Gleixner <tglx@linutronix.de>
  23 Cc: linux-kernel@vger.kernel.org
  24 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  25 (cherry picked from commit 1ca1d1e5618960574fb01507dbab07e5337049a1)
  26 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  27 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  28 (cherry picked from commit 3dd05d51e337e9d780fb0e7c46d7216a79380d7b)
  29 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  30 ---
  31  tools/objtool/arch/x86/include/asm/inat.h | 10 ++++++++++
  32  1 file changed, 10 insertions(+)
  33
  34 diff --git a/tools/objtool/arch/x86/include/asm/inat.h b/tools/objtool/arch/x86/include/asm/inat.h
  35 index 02aff0867211..1c78580e58be 100644
  36 --- a/tools/objtool/arch/x86/include/asm/inat.h
  37 +++ b/tools/objtool/arch/x86/include/asm/inat.h
  38 @@ -97,6 +97,16 @@
  39  #define INAT_MAKE_GROUP(grp)   ((grp << INAT_GRP_OFFS) | INAT_MODRM)
  40  #define INAT_MAKE_IMM(imm)     (imm << INAT_IMM_OFFS)
  41
  42 +/* Identifiers for segment registers */
  43 +#define INAT_SEG_REG_IGNORE    0
  44 +#define INAT_SEG_REG_DEFAULT   1
  45 +#define INAT_SEG_REG_CS                2
  46 +#define INAT_SEG_REG_SS                3
  47 +#define INAT_SEG_REG_DS                4
  48 +#define INAT_SEG_REG_ES                5
  49 +#define INAT_SEG_REG_FS                6
  50 +#define INAT_SEG_REG_GS                7
  51 +
  52  /* Attribute search APIs */
  53  extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode);
  54  extern int inat_get_last_prefix_id(insn_byte_t last_pfx);
  55 --
  56 2.14.2
  57