summaryrefslogtreecommitdiff
path: root/kernel/events
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-03-12 13:56:37 +0300
committerPeter Zijlstra <peterz@infradead.org>2020-03-20 13:06:22 +0100
commita6763625ae6f8aa5ee82fcd8fa4e5e38db20dbc6 (patch)
tree27eaffee9c26ceed5840810875d14e3648e96bc2 /kernel/events
parent90c91dfb86d0ff545bd329d3ddd72c147e2ae198 (diff)
perf/core: Fix reversed NULL check in perf_event_groups_less()
This NULL check is reversed so it leads to a Smatch warning and presumably a NULL dereference. kernel/events/core.c:1598 perf_event_groups_less() error: we previously assumed 'right->cgrp->css.cgroup' could be null (see line 1590) Fixes: 95ed6c707f26 ("perf/cgroup: Order events in RB tree by cgroup id") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200312105637.GA8960@mwanda
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index b5a68d26f0b9..d22e4ba59dfa 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1586,7 +1586,7 @@ perf_event_groups_less(struct perf_event *left, struct perf_event *right)
*/
return true;
}
- if (!right->cgrp || right->cgrp->css.cgroup) {
+ if (!right->cgrp || !right->cgrp->css.cgroup) {
/*
* Right has no cgroup but left does, no cgroups come
* first.