Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 226f016a authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware) Committed by Greg Kroah-Hartman
Browse files

x86: Hide the int3_emulate_call/jmp functions from UML 



commit 693713cbdb3a4bda5a8a678c31f06560bbb14657 upstream.

User Mode Linux does not have access to the ip or sp fields of the pt_regs,
and accessing them causes UML to fail to build. Hide the int3_emulate_jmp()
and int3_emulate_call() instructions from UML, as it doesn't need them
anyway.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent aa07ecba

arch/x86/include/asm/text-patching.h

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_regs *regs); 
extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);

extern int after_bootmem;



#ifndef CONFIG_UML_X86

static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned long ip)

{

	regs->ip = ip;
@@ -65,6 +66,7 @@ static inline void int3_emulate_call(struct pt_regs *regs, unsigned long func) 
	int3_emulate_push(regs, regs->ip - INT3_INSN_SIZE + CALL_INSN_SIZE);

	int3_emulate_jmp(regs, func);

}

#endif

#endif /* CONFIG_X86_64 */

#endif /* !CONFIG_UML_X86 */



#endif /* _ASM_X86_TEXT_PATCHING_H */