| From 693713cbdb3a4bda5a8a678c31f06560bbb14657 Mon Sep 17 00:00:00 2001 |
| From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> |
| Date: Sat, 11 May 2019 08:32:40 -0400 |
| Subject: x86: Hide the int3_emulate_call/jmp functions from UML |
| |
| From: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| |
| 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: kbuild test robot <lkp@intel.com> |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/include/asm/text-patching.h | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/arch/x86/include/asm/text-patching.h |
| +++ b/arch/x86/include/asm/text-patching.h |
| @@ -39,6 +39,7 @@ extern int poke_int3_handler(struct pt_r |
| 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(str |
| 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 */ |
