]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/fred: Fix incorrect error code printout in fred_bad_type()
authorHou Wenlong <houwenlong.hwl@antgroup.com>
Wed, 17 Apr 2024 11:34:25 +0000 (19:34 +0800)
committerBorislav Petkov (AMD) <bp@alien8.de>
Thu, 18 Apr 2024 08:47:17 +0000 (10:47 +0200)
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

index 9fa18b8c7f264a409dfc1256a183d93139b1cabc..89c1476fcdd9f95825c0dbbb320b86b66360ce9e 100644 (file)
@@ -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);