]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/entry_32: Clear CPU buffers after register restore in NMI return
authorPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Wed, 25 Sep 2024 22:25:44 +0000 (15:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Oct 2024 13:40:46 +0000 (15:40 +0200)
commitb6400eb0b347821efc57760221f8fb6d63b9548a
tree839c7346ae717ba2ee4c354ff155e84d88948f06
parenta6f4701f8dcf0690ecff35a39f2f4a382b1b29cc
x86/entry_32: Clear CPU buffers after register restore in NMI return

commit 48a2440d0f20c826b884e04377ccc1e4696c84e9 upstream.

CPU buffers are currently cleared after call to exc_nmi, but before
register state is restored. This may be okay for MDS mitigation but not for
RDFS. Because RDFS mitigation requires CPU buffers to be cleared when
registers don't have any sensitive data.

Move CLEAR_CPU_BUFFERS after RESTORE_ALL_NMI.

Fixes: a0e2dab44d22 ("x86/entry_32: Add VERW just before userspace transition")
Suggested-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc:stable@vger.kernel.org
Link: https://lore.kernel.org/all/20240925-fix-dosemu-vm86-v7-2-1de0daca2d42%40linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/entry/entry_32.S