| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- From 6723159121227f7f8d32c09ea4c2237a40266880 Mon Sep 17 00:00:00 2001
- From: Ingo Molnar <[email protected]>
- Date: Tue, 14 Nov 2017 07:24:22 +0100
- Subject: [PATCH 132/232] tools/headers: Sync objtool UAPI header
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- CVE-2017-5754
- objtool grew this new warning:
- Warning: synced file at 'tools/objtool/arch/x86/include/asm/inat.h' differs from latest kernel version at 'arch/x86/include/asm/inat.h'
- which upstream header grew new INAT_SEG_* definitions.
- Sync up the tooling version of the header.
- Reported-by: Linus Torvalds <[email protected]>
- Cc: Josh Poimboeuf <[email protected]>
- Cc: Peter Zijlstra <[email protected]>
- Cc: Thomas Gleixner <[email protected]>
- Cc: [email protected]
- Signed-off-by: Ingo Molnar <[email protected]>
- (cherry picked from commit 1ca1d1e5618960574fb01507dbab07e5337049a1)
- Signed-off-by: Andy Whitcroft <[email protected]>
- Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
- (cherry picked from commit 3dd05d51e337e9d780fb0e7c46d7216a79380d7b)
- Signed-off-by: Fabian Grünbichler <[email protected]>
- ---
- tools/objtool/arch/x86/include/asm/inat.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
- diff --git a/tools/objtool/arch/x86/include/asm/inat.h b/tools/objtool/arch/x86/include/asm/inat.h
- index 02aff0867211..1c78580e58be 100644
- --- a/tools/objtool/arch/x86/include/asm/inat.h
- +++ b/tools/objtool/arch/x86/include/asm/inat.h
- @@ -97,6 +97,16 @@
- #define INAT_MAKE_GROUP(grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM)
- #define INAT_MAKE_IMM(imm) (imm << INAT_IMM_OFFS)
-
- +/* Identifiers for segment registers */
- +#define INAT_SEG_REG_IGNORE 0
- +#define INAT_SEG_REG_DEFAULT 1
- +#define INAT_SEG_REG_CS 2
- +#define INAT_SEG_REG_SS 3
- +#define INAT_SEG_REG_DS 4
- +#define INAT_SEG_REG_ES 5
- +#define INAT_SEG_REG_FS 6
- +#define INAT_SEG_REG_GS 7
- +
- /* Attribute search APIs */
- extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode);
- extern int inat_get_last_prefix_id(insn_byte_t last_pfx);
- --
- 2.14.2
|
