1 files changed, 2 insertions, 3 deletions

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 03cc061398d1..58ed1dae5875 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -5148,7 +5148,7 @@ int perf_event_init_task(struct task_struct *child)
                                             GFP_KERNEL);
                         if (!child_ctx) {
                                 ret = -ENOMEM;
-                                goto exit;
+                                break;
                         }
 
                         __perf_event_init_context(child_ctx, child);
@@ -5164,7 +5164,7 @@ int perf_event_init_task(struct task_struct *child)
                 }
         }
 
-        if (inherited_all) {
+        if (child_ctx && inherited_all) {
                 /*
                  * Mark the child context as a clone of the parent
                  * context, or of whatever the parent is a clone of.
@@ -5184,7 +5184,6 @@ int perf_event_init_task(struct task_struct *child)
                 get_ctx(child_ctx->parent_ctx);
         }
 
-exit:
         mutex_unlock(&parent_ctx->mutex);
 
         perf_unpin_context(parent_ctx);