diff --git a/include/linux/sched.h b/include/linux/sched.h
index 6f8e0cb8b55b97db2ec4f4f90b174b3b024df191..a133a67a1b86848ad2c2d112bf634911c953f4fd 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2175,8 +2175,10 @@ const struct cpumask *sched_trace_rd_span(struct root_domain *rd);
 
 #ifdef CONFIG_SCHED_CORE
 extern void sched_core_free(struct task_struct *tsk);
+extern void sched_core_fork(struct task_struct *p);
 #else
 static inline void sched_core_free(struct task_struct *tsk) { }
+static inline void sched_core_fork(struct task_struct *p) { }
 #endif
 
 #ifdef CONFIG_QOS_SCHED
diff --git a/kernel/fork.c b/kernel/fork.c
index 628c2b3fafedd61bab007ab4f5ecbb8cd37ef810..8a2e827815b630d878630bbac47153d435bc24fc 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2278,6 +2278,8 @@ static __latent_entropy struct task_struct *copy_process(
 
 	klp_copy_process(p);
 
+	sched_core_fork(p);
+
 	spin_lock(&current->sighand->siglock);
 
 	/*
@@ -2364,6 +2366,7 @@ static __latent_entropy struct task_struct *copy_process(
 	return p;
 
 bad_fork_cancel_cgroup:
+	sched_core_free(p);
 	spin_unlock(&current->sighand->siglock);
 	write_unlock_irq(&tasklist_lock);
 	cgroup_cancel_fork(p, args);
diff --git a/kernel/sched/core_sched.c b/kernel/sched/core_sched.c
index 8d0869a9eb8c3103a254b154652a1707a1de9db7..dcbbeaefaaa3a6d0ec3c4cd0d6d075f9f2a8591e 100644
--- a/kernel/sched/core_sched.c
+++ b/kernel/sched/core_sched.c
@@ -103,6 +103,12 @@ static unsigned long sched_core_clone_cookie(struct task_struct *p)
 	return cookie;
 }
 
+void sched_core_fork(struct task_struct *p)
+{
+	RB_CLEAR_NODE(&p->core_node);
+	p->core_cookie = sched_core_clone_cookie(current);
+}
+
 void sched_core_free(struct task_struct *p)
 {
 	sched_core_put_cookie(p->core_cookie);