Commit 6f357367 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Borislav Petkov:
 "Fix a NULL-ptr dereference when recalculating a sched entity's weight"

* tag 'sched_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix fault in reweight_entity
parents f5e02656 13765de8

kernel/sched/core.c

+6 −5
Original line number Diff line number Diff line
@@ -1214,8 +1214,9 @@ int tg_nop(struct task_group *tg, void *data) 
}

#endif



static void set_load_weight(struct task_struct *p, bool update_load)

static void set_load_weight(struct task_struct *p)

{

	bool update_load = !(READ_ONCE(p->__state) & TASK_NEW);

	int prio = p->static_prio - MAX_RT_PRIO;

	struct load_weight *load = &p->se.load;
@@ -4406,7 +4407,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) 
			p->static_prio = NICE_TO_PRIO(0);



		p->prio = p->normal_prio = p->static_prio;

		set_load_weight(p, false);

		set_load_weight(p);



		/*

		 * We don't need the reset flag anymore after the fork. It has
@@ -6921,7 +6922,7 @@ void set_user_nice(struct task_struct *p, long nice) 
		put_prev_task(rq, p);



	p->static_prio = NICE_TO_PRIO(nice);

	set_load_weight(p, true);

	set_load_weight(p);

	old_prio = p->prio;

	p->prio = effective_prio(p);
@@ -7212,7 +7213,7 @@ static void __setscheduler_params(struct task_struct *p, 
	 */

	p->rt_priority = attr->sched_priority;

	p->normal_prio = normal_prio(p);

	set_load_weight(p, true);

	set_load_weight(p);

}



/*
@@ -9445,7 +9446,7 @@ void __init sched_init(void) 
#endif

	}



	set_load_weight(&init_task, false);

	set_load_weight(&init_task);



	/*

	 * The boot idle thread does lazy MMU switching as well: