iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/extable: Tidy up redundant handler functions

Browse Source 
No need to have the same code all over the place.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210908132524.963232825@linutronix.de
This commit is contained in:
Thomas Gleixner
2021-09-08 15:29:12 +02:00
committed by Borislav Petkov
parent 6880fa6c56
commit 326b567f82
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/mm/extable.c
View File

@@ -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,
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,
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
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
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);