Commit a4b37f50 authored by Hou Wenlong's avatar Hou Wenlong Committed by Borislav Petkov (AMD)
Browse files

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: 14619d91 ("x86/fred: FRED entry/exit and dispatch code")
Signed-off-by: default avatarHou Wenlong <houwenlong.hwl@antgroup.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Link: https://lore.kernel.org/r/b2a8f0a41449d25240e314a2ddfbf6549511fb04.1713353612.git.houwenlong.hwl@antgroup.com
parent 32f5f73b

arch/x86/entry/entry_fred.c

+4 −4
Original line number Diff line number Diff line
@@ -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);