x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches.
authorAnthony Steinhauser <asteinhauser@google.com>
Sun, 7 Jun 2020 12:44:19 +0000 (05:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jun 2020 14:40:25 +0000 (16:40 +0200)
commite1545848ad5510e82eb75717c1f5757b984014cb
treea5baa7b7f1246a436d3a48ff43f51c5e052942c4
parent6d60d5462a91eb46fb88b016508edfa8ee0bc7c8
x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches.

commit 4d8df8cbb9156b0a0ab3f802b80cb5db57acc0bf upstream.

Currently, it is possible to enable indirect branch speculation even after
it was force-disabled using the PR_SPEC_FORCE_DISABLE option. Moreover, the
PR_GET_SPECULATION_CTRL command gives afterwards an incorrect result
(force-disabled when it is in fact enabled). This also is inconsistent
vs. STIBP and the documention which cleary states that
PR_SPEC_FORCE_DISABLE cannot be undone.

Fix this by actually enforcing force-disabled indirect branch
speculation. PR_SPEC_ENABLE called after PR_SPEC_FORCE_DISABLE now fails
with -EPERM as described in the documentation.

Fixes: 9137bb27e60e ("x86/speculation: Add prctl() control for indirect branch speculation")
Signed-off-by: Anthony Steinhauser <asteinhauser@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/cpu/bugs.c