Commit e2d37148 authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Peter Zijlstra
Browse files

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: bd275681 ("perf: Rewrite core context handling")
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221118051539.820-1-ravi.bangoria@amd.com
parent 1b929c02

kernel/events/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13231,7 +13231,7 @@ inherit_event(struct perf_event *parent_event, 
	pmu_ctx = find_get_pmu_context(child_event->pmu, child_ctx, child_event);

	pmu_ctx = find_get_pmu_context(child_event->pmu, child_ctx, child_event);

	if (IS_ERR(pmu_ctx)) {

	if (IS_ERR(pmu_ctx)) {

		free_event(child_event);

		free_event(child_event);

		return NULL;

		return ERR_CAST(pmu_ctx);

	}

	}

	child_event->pmu_ctx = pmu_ctx;

	child_event->pmu_ctx = pmu_ctx;