Commit 3a874988 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_urgent_for_v6.7_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Borislav Petkov:

 - Make sure tasks are thawed exactly and only once to avoid their state
   getting corrupted

* tag 'sched_urgent_for_v6.7_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  freezer,sched: Do not restore saved_state of a thawed task
parents 537ccb5d 23ab79e8

kernel/freezer.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void __thaw_task(struct task_struct *p) 
	if (WARN_ON_ONCE(freezing(p)))

		goto unlock;



	if (task_call_func(p, __restore_freezer_state, NULL))

	if (!frozen(p) || task_call_func(p, __restore_freezer_state, NULL))

		goto unlock;



	wake_up_state(p, TASK_FROZEN);