lkml.org 
[lkml]   [2024]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/urgent] x86/fred: Fix incorrect error code printout in fred_bad_type()
    The following commit has been merged into the x86/urgent branch of tip:

    Commit-ID: a4b37f5033fa812f02f3b7bd1242393d347ba791
    Gitweb: https://git.kernel.org/tip/a4b37f5033fa812f02f3b7bd1242393d347ba791
    Author: Hou Wenlong <houwenlong.hwl@antgroup.com>
    AuthorDate: Wed, 17 Apr 2024 19:34:25 +08:00
    Committer: Borislav Petkov (AMD) <bp@alien8.de>
    CommitterDate: Thu, 18 Apr 2024 10:47:17 +02:00

    x86/fred: Fix incorrect error code printout in fred_bad_type()

    regs->orig_ax has been set to -1 on entry so in the printout,
    fred_bad_type() should use the passed parameter error_code.

    Fixes: 14619d912b65 ("x86/fred: FRED entry/exit and dispatch code")
    Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    Acked-by: H. Peter Anvin (Intel) <hpa@zytor.com>
    Link: https://lore.kernel.org/r/b2a8f0a41449d25240e314a2ddfbf6549511fb04.1713353612.git.houwenlong.hwl@antgroup.com
    ---
    arch/x86/entry/entry_fred.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/entry/entry_fred.c b/arch/x86/entry/entry_fred.c
    index 9fa18b8..89c1476 100644
    --- a/arch/x86/entry/entry_fred.c
    +++ b/arch/x86/entry/entry_fred.c
    @@ -28,9 +28,9 @@ static noinstr void fred_bad_type(struct pt_regs *regs, unsigned long error_code
    if (regs->fred_cs.sl > 0) {
    pr_emerg("PANIC: invalid or fatal FRED event; event type %u "
    "vector %u error 0x%lx aux 0x%lx at %04x:%016lx\n",
    - regs->fred_ss.type, regs->fred_ss.vector, regs->orig_ax,
    + regs->fred_ss.type, regs->fred_ss.vector, error_code,
    fred_event_data(regs), regs->cs, regs->ip);
    - die("invalid or fatal FRED event", regs, regs->orig_ax);
    + die("invalid or fatal FRED event", regs, error_code);
    panic("invalid or fatal FRED event");
    } else {
    unsigned long flags = oops_begin();
    @@ -38,10 +38,10 @@ static noinstr void fred_bad_type(struct pt_regs *regs, unsigned long error_code

    pr_alert("BUG: invalid or fatal FRED event; event type %u "
    "vector %u error 0x%lx aux 0x%lx at %04x:%016lx\n",
    - regs->fred_ss.type, regs->fred_ss.vector, regs->orig_ax,
    + regs->fred_ss.type, regs->fred_ss.vector, error_code,
    fred_event_data(regs), regs->cs, regs->ip);

    - if (__die("Invalid or fatal FRED event", regs, regs->orig_ax))
    + if (__die("Invalid or fatal FRED event", regs, error_code))
    sig = 0;

    oops_end(flags, regs, sig);
    \
     
     \ /
      Last update: 2024-05-27 16:44    [W:2.912 / U:1.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site