| From bc2ead6f5284f95110f3935bc657ec9167e8337c Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 25 Feb 2020 22:36:37 +0100 |
| Subject: [PATCH] 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: e59d1b0a2419 ("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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S |
| index f07baf0388bc..390edb763826 100644 |
| --- a/arch/x86/entry/entry_32.S |
| +++ b/arch/x86/entry/entry_32.S |
| @@ -1647,6 +1647,7 @@ ENTRY(int3) |
| END(int3) |
| |
| ENTRY(general_protection) |
| + ASM_CLAC |
| pushl $do_general_protection |
| jmp common_exception |
| END(general_protection) |
| -- |
| 2.7.4 |
| |
