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@xxxxxxx> AuthorDate: Fri, 18 Nov 2022 10:45:39 +05:30 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20221118051539.820-1-ravi.bangoria@xxxxxxx --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;
![]() |