Commit 7460d17c authored Feb 25, 2020 by Thomas Gleixner Committed by Greg Kroah-Hartman Apr 17, 2020

x86/entry/32: Add missing ASM_CLAC to general_protection entry



commit 3d51507f29f2153a658df4a0674ec5b592b62085 upstream.

All exception entry points must have ASM_CLAC right at the
beginning. The general_protection entry is missing one.

Fixes: e59d1b0a ("x86-32, smap: Add STAC/CLAC instructions to 32-bit kernel entry")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20200225220216.219537887@linutronix.de


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a2a1be2d

arch/x86/entry/entry_32.S

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1489,6 +1489,7 @@ ENTRY(int3)
	END(int3)		END(int3)

	ENTRY(general_protection)		ENTRY(general_protection)
			ASM_CLAC
	pushl $do_general_protection		pushl $do_general_protection
	jmp common_exception		jmp common_exception
	END(general_protection)		END(general_protection)