From: Rodrigo Branco <bsdaemon@google.com>
Date: Tue, 3 Jan 2023 20:17:51 +0000 (-0600)
Subject: x86/bugs: Flush IBP in ib_prctl_set()
X-Git-Tag: v6.6.17~5815^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a664ec9158eeddd75121d39c9a0758016097fa96;p=platform%2Fkernel%2Flinux-rpi.git

x86/bugs: Flush IBP in ib_prctl_set()

We missed the window between the TIF flag update and the next reschedule.

Signed-off-by: Rodrigo Branco <bsdaemon@google.com>
Reviewed-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: <stable@vger.kernel.org>
---

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index d970ddb..bca0bd8 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1981,6 +1981,8 @@ static int ib_prctl_set(struct task_struct *task, unsigned long ctrl)
 		if (ctrl == PR_SPEC_FORCE_DISABLE)
 			task_set_spec_ib_force_disable(task);
 		task_update_spec_tif(task);
+		if (task == current)
+			indirect_branch_prediction_barrier();
 		break;
 	default:
 		return -ERANGE;