summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-10-24 20:04:21 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-10-24 20:04:21 +0300
commit6c62666d8879238578b727f8e0a821e90c88f87e (patch)
tree81342b5ead319db4f94f1a125cb0e911c93402af
parent16bc177666c037b4aa3e1f68f4eac685006c622b (diff)
parent63acd42c0d4942f74710b11c38602fb14dea7320 (diff)
downloadlinux-6c62666d8879238578b727f8e0a821e90c88f87e.tar.xz
Merge tag 'sched_urgent_for_v5.15_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov: "Reset clang's Shadow Call Stack on hotplug to prevent it from overflowing" * tag 'sched_urgent_for_v5.15_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/scs: Reset the shadow stack when idle_task_exit
-rw-r--r--kernel/sched/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1bba4128a3e6..f21714ea3db8 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8795,6 +8795,7 @@ void idle_task_exit(void)
finish_arch_post_lock_switch();
}
+ scs_task_reset(current);
/* finish_cpu(), as ran on the BP, will clean up the active_mm state */
}