lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 141/201] x86/extable: Tidy up redundant handler functions
    Date
    From: Thomas Gleixner <tglx@linutronix.de>

    [ Upstream commit 326b567f82df0c4c8f50092b9af9a3014616fb3c ]

    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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/mm/extable.c | 16 +++++-----------
    1 file changed, 5 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
    index e1664e9f969c..d9a1046f3a98 100644
    --- a/arch/x86/mm/extable.c
    +++ b/arch/x86/mm/extable.c
    @@ -39,9 +39,8 @@ __visible bool ex_handler_fault(const struct exception_table_entry *fixup,
    unsigned long error_code,
    unsigned long fault_addr)
    {
    - regs->ip = ex_fixup_addr(fixup);
    regs->ax = trapnr;
    - return true;
    + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
    }
    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)
    {
    WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?");
    - regs->ip = ex_fixup_addr(fixup);
    - return true;
    + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
    }
    EXPORT_SYMBOL(ex_handler_uaccess);

    @@ -87,9 +85,7 @@ __visible bool ex_handler_copy(const struct exception_table_entry *fixup,
    unsigned long fault_addr)
    {
    WARN_ONCE(trapnr == X86_TRAP_GP, "General protection fault in user access. Non-canonical address?");
    - regs->ip = ex_fixup_addr(fixup);
    - regs->ax = trapnr;
    - return true;
    + return ex_handler_fault(fixup, regs, trapnr, error_code, fault_addr);
    }
    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);

    /* Pretend that the read succeeded and returned 0. */
    - regs->ip = ex_fixup_addr(fixup);
    regs->ax = 0;
    regs->dx = 0;
    - return true;
    + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
    }
    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);

    /* Pretend that the write succeeded. */
    - regs->ip = ex_fixup_addr(fixup);
    - return true;
    + return ex_handler_default(fixup, regs, trapnr, error_code, fault_addr);
    }
    EXPORT_SYMBOL(ex_handler_wrmsr_unsafe);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-07-27 19:22    [W:5.154 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site