All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] sched/fair: Fix null pointer dereference of empty queues
@ 2015-05-25 18:00 Mohammed Naser
  2015-05-25 20:38 ` Peter Zijlstra
  0 siblings, 1 reply; 8+ messages in thread
From: Mohammed Naser @ 2015-05-25 18:00 UTC (permalink / raw)
  To: linux-kernel; +Cc: peterz, mingo, Mohammed Naser

Calling put_prev_task() can result in nr_running being updated
to zero, which would then crash the system when the kernel
attempts to pick_next_entity() with an empty queue.

Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
---
 kernel/sched/fair.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0d4632f..dd0a74a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5374,12 +5374,11 @@ again:
 simple:
 	cfs_rq = &rq->cfs;
 #endif
+	put_prev_task(rq, prev);
 
 	if (!cfs_rq->nr_running)
 		goto idle;
 
-	put_prev_task(rq, prev);
-
 	do {
 		se = pick_next_entity(cfs_rq, NULL);
 		set_next_entity(cfs_rq, se);
@@ -5415,7 +5414,10 @@ idle:
 static void put_prev_task_fair(struct rq *rq, struct task_struct *prev)
 {
 	struct sched_entity *se = &prev->se;
-	struct cfs_rq *cfs_rq;
+	struct cfs_rq *cfs_rq = &rq->cfs;
+
+	if (!cfs_rq->nr_running)
+		return;
 
 	for_each_sched_entity(se) {
 		cfs_rq = cfs_rq_of(se);
-- 
2.3.2 (Apple Git-55)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-05-27 12:39 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-25 18:00 [PATCH] sched/fair: Fix null pointer dereference of empty queues Mohammed Naser
2015-05-25 20:38 ` Peter Zijlstra
     [not found]   ` <CAEs876hF0rcSdqoKf-JASnKP0SFs70EREzpxFs9M9qC51Ea6zA@mail.gmail.com>
2015-05-25 20:49     ` Mohammed Naser
2015-05-25 21:51       ` Kirill Tkhai
2015-05-26 17:38         ` bsegall
2015-05-26 17:56           ` Mohammed Naser
2015-05-26 18:05             ` Mohammed Naser
2015-05-27 12:33           ` Kirill Tkhai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.