Messages in this thread Patch in this message | | | From | Alexander Shishkin <> | Subject | [PATCH] perf: Consistently fail fork on allocation failures | Date | Tue, 5 Nov 2019 09:57:02 +0200 |
| |
Commit
313ccb9615948 ("perf: Allocate context task_ctx_data for child event")
makes the inherit path skip over the current event in case of task_ctx_data allocation failure. This, however, is inconsistent with allocation failures in perf_event_alloc(), which would abort the fork.
Correct this by returning an error code on task_ctx_data allocation failure and failing the fork in that case.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> --- 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 8ff1218e91b1..c8203f1b2d20 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -12026,7 +12026,7 @@ inherit_event(struct perf_event *parent_event, GFP_KERNEL); if (!child_ctx->task_ctx_data) { free_event(child_event); - return NULL; + return ERR_PTR(-ENOMEM); } } -- 2.24.0.rc1
| |