diff mbox series

[tip:,perf/urgent] perf core: Return error pointer if inherit_event() fails to find pmu_ctx

Message ID 167214188410.4906.8195204511062431247.tip-bot2@tip-bot2
State New
Headers
Series [tip:,perf/urgent] perf core: Return error pointer if inherit_event() fails to find pmu_ctx |

Commit Message

tip-bot2 for Thomas Gleixner Dec. 27, 2022, 11:51 a.m. UTC 
  The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     e2d371484653ac83b970d3ebcf343383f39f8b6b
Gitweb:        https://git.kernel.org/tip/e2d371484653ac83b970d3ebcf343383f39f8b6b
Author:        Ravi Bangoria <ravi.bangoria@amd.com>
AuthorDate:    Fri, 18 Nov 2022 10:45:39 +05:30
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 27 Dec 2022 12:44:00 +01:00

perf core: Return error pointer if inherit_event() fails to find pmu_ctx

inherit_event() returns NULL only when it finds orphaned events
otherwise it returns either valid child_event pointer or an error
pointer. Follow the same when it fails to find pmu_ctx.

Fixes: bd2756811766 ("perf: Rewrite core context handling")
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221118051539.820-1-ravi.bangoria@amd.com
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/kernel/events/core.c b/kernel/events/core.c
index eacc370..4bd2434 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -13231,7 +13231,7 @@  inherit_event(struct perf_event *parent_event,
 	pmu_ctx = find_get_pmu_context(child_event->pmu, child_ctx, child_event);
 	if (IS_ERR(pmu_ctx)) {
 		free_event(child_event);
-		return NULL;
+		return ERR_CAST(pmu_ctx);
 	}
 	child_event->pmu_ctx = pmu_ctx;