Commit cd19bab8 authored by H. Peter Anvin (Intel)'s avatar H. Peter Anvin (Intel) Committed by Borislav Petkov (AMD)
Browse files

x86/objtool: Teach objtool about ERET[US] 



Update the objtool decoder to know about the ERET[US] instructions
(type INSN_CONTEXT_SWITCH).

Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: default avatarXin Li <xin3.li@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Tested-by: default avatarShan Kang <shan.kang@intel.com>
Link: https://lore.kernel.org/r/20231205105030.8698-11-xin3.li@intel.com
parent 0115f8b1

tools/objtool/arch/x86/decode.c

+14 −5
Original line number Diff line number Diff line
@@ -509,11 +509,20 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec 


		if (op2 == 0x01) {



			switch (insn_last_prefix_id(&ins)) {

			case INAT_PFX_REPE:

			case INAT_PFX_REPNE:

				if (modrm == 0xca)

					/* eretu/erets */

					insn->type = INSN_CONTEXT_SWITCH;

				break;

			default:

				if (modrm == 0xca)

					insn->type = INSN_CLAC;

				else if (modrm == 0xcb)

					insn->type = INSN_STAC;



				break;

			}

		} else if (op2 >= 0x80 && op2 <= 0x8f) {



			insn->type = INSN_JUMP_CONDITIONAL;