aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2016-06-01 16:33:55 +0100
committerJon Medhurst <tixy@linaro.org>2016-11-21 15:49:32 +0000
commit8523f080d500f5784699322115c593f95783fd2b (patch)
tree5ababb4a997f280987cce3a5df141452bd9c1e77
parent41e58098703b24e33f8372f82a65bb0f82ecf14a (diff)
sched/tune: Avoid null pointer dereference in schedtune_add_cluster_nrg
A CPU's scheduler domain doesn't always have a parent e.g. if we only have one cluster present or enabled in the system.
-rw-r--r--kernel/sched/tune.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/tune.c b/kernel/sched/tune.c
index 505d7b35b0e1..97e9f48b093f 100644
--- a/kernel/sched/tune.c
+++ b/kernel/sched/tune.c
@@ -878,7 +878,7 @@ schedtune_add_cluster_nrg(
* Assume we have EM data only at the CPU and
* the upper CLUSTER level
*/
- BUG_ON(!cpumask_equal(
+ BUG_ON(sd2->parent && !cpumask_equal(
sched_group_cpus(sg),
sched_group_cpus(sd2->parent->groups)
));