From e3473cacaa2916b8e11fb2b26be2b675b9c23ee3 Mon Sep 17 00:00:00 2001 From: Olav Haugan Date: Sat, 16 Jul 2016 10:39:06 -0700 Subject: sched/core: Fix null-pointer dereference Turning on sched_use_pelt causes a null-pointer dereference in scheduler. Add correct checking of varable. CRs-fixed: 1042656 Change-Id: I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5 Signed-off-by: Olav Haugan --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 859416724e5a..958d79e1933c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4343,7 +4343,7 @@ __update_load_avg(u64 now, int cpu, struct sched_avg *sa, return 0; sa->last_update_time = now; - if (sched_use_pelt && !cfs_rq && weight) { + if (sched_use_pelt && cfs_rq && weight) { se = container_of(sa, struct sched_entity, avg); if (entity_is_task(se) && se->on_rq) dec_hmp_sched_stats_fair(rq_of(cfs_rq), task_of(se)); -- cgit v1.2.3