Commit 326b567f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov

x86/extable: Tidy up redundant handler functions

No need to have the same code all over the place.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210908132524.963232825@linutronix.de
parent 6880fa6c
...@@ -39,9 +39,8 @@ __visible bool ex_handler_fault(const struct exception_table_entry *fixup, ...@@ -39,9 +39,8 @@ __visible bool ex_handler_fault(const struct exception_table_entry *fixup,
unsigned long error_code, unsigned long error_code,
unsigned long fault_addr) unsigned long fault_addr)
{ {
regs->ip = ex_fixup_addr(fixup);
regs->ax = trapnr; regs->ax = trapnr;
return true; return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
} }
EXPORT_SYMBOL_GPL(ex_handler_fault); EXPORT_SYMBOL_GPL(ex_handler_fault);
...@@ -76,8 +75,7 @@ __visible bool ex_handler_uaccess(const struct exception_table_entry *fixup, ...@@ -76,8 +75,7 @@ __visible bool ex_handler_uaccess(const struct exception_table_entry *fixup,
unsigned long fault_addr) unsigned long fault_addr)
{ {
WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?"); WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?");
regs->ip = ex_fixup_addr(fixup); return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
return true;
} }
EXPORT_SYMBOL(ex_handler_uaccess); EXPORT_SYMBOL(ex_handler_uaccess);
...@@ -87,9 +85,7 @@ __visible bool ex_handler_copy(const struct exception_table_entry *fixup, ...@@ -87,9 +85,7 @@ __visible bool ex_handler_copy(const struct exception_table_entry *fixup,
unsigned long fault_addr) unsigned long fault_addr)
{ {
WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?"); WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?");
regs->ip = ex_fixup_addr(fixup); return ex_handler_fault(fixup, regs, trapnr, error_code, fault_addr);
regs->ax = trapnr;
return true;
} }
EXPORT_SYMBOL(ex_handler_copy); EXPORT_SYMBOL(ex_handler_copy);
...@@ -103,10 +99,9 @@ __visible bool ex_handler_rdmsr_unsafe(const struct exception_table_entry *fixup ...@@ -103,10 +99,9 @@ __visible bool ex_handler_rdmsr_unsafe(const struct exception_table_entry *fixup
show_stack_regs(regs); show_stack_regs(regs);
/* Pretend that the read succeeded and returned 0. */ /* Pretend that the read succeeded and returned 0. */
regs->ip = ex_fixup_addr(fixup);
regs->ax = 0; regs->ax = 0;
regs->dx = 0; regs->dx = 0;
return true; return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
} }
EXPORT_SYMBOL(ex_handler_rdmsr_unsafe); EXPORT_SYMBOL(ex_handler_rdmsr_unsafe);
...@@ -121,8 +116,7 @@ __visible bool ex_handler_wrmsr_unsafe(const struct exception_table_entry *fixup ...@@ -121,8 +116,7 @@ __visible bool ex_handler_wrmsr_unsafe(const struct exception_table_entry *fixup
show_stack_regs(regs); show_stack_regs(regs);
/* Pretend that the write succeeded. */ /* Pretend that the write succeeded. */
regs->ip = ex_fixup_addr(fixup); return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
return true;
} }
EXPORT_SYMBOL(ex_handler_wrmsr_unsafe); EXPORT_SYMBOL(ex_handler_wrmsr_unsafe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment