Skip to contentSkip to conversation

perf/core: Fix reversed NULL check in perf_event_groups_less()

PATCH Applied Dan Carpenter 4 participants 4 messages Mar 12, 2020 – Mar 21, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
index 6a47c3e54fe9..607c04ec7cfa 100644
@@ -1587,7 +1587,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.
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 18 lines · Dan Carpenter

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")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +0 -0
index 6a47c3e54fe9..607c04ec7cfa 100644

kernel/events/core.c perf_event_groups_less(struct perf_event *left, struct perf_event *right) · line 1593

Quoted 8 lines
kernel/events/core.c +1 -1
@@ -1587,7 +1587,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.

Thanks!

reviewer
#2 lore raw
Quoted 15 lines · Peter Zijlstra
Quoted 13 lines · Dan Carpenter

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")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines

kernel/events/core.c perf_event_groups_less(struct perf_event *left, struct perf_event *right) · line 1593

Quoted 13 lines
kernel/events/core.c +1 -1
index 6a47c3e54fe9..607c04ec7cfa 100644
@@ -1587,7 +1587,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.

Thanks!

Also much thanks!

Ian

merge bot Applied
#3 lore raw
In reply to Dan Carpenter
The following commit has been merged into the perf/core branch of tip:

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     a6763625ae6f8aa5ee82fcd8fa4e5e38db20dbc6
Gitweb:        https://git.kernel.org/tip/a6763625ae6f8aa5ee82fcd8fa4e5e38db20dbc6
Author:        Dan Carpenter <[email protected]>
AuthorDate:    Thu, 12 Mar 2020 13:56:37 +03:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Fri, 20 Mar 2020 13:06:22 +01:00

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")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
index b5a68d2..d22e4ba 100644
@@ -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.