Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c72e350 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

perf: fix perf bug in fork() 



Oleg noticed that a cleanup by Sylvain actually uncovered a bug; by
calling perf_event_free_task() when failing sched_fork() we will not yet
have done the memset() on ->perf_event_ctxp[] and will therefore try and
'free' the inherited contexts, which are still in use by the parent
process.  This is bad..

Suggested-by: default avatarOleg Nesterov <oleg@redhat.com>
Reported-by: default avatarOleg Nesterov <oleg@redhat.com>
Reported-by: default avatarSylvain 'ythier' Hitier <sylvain.hitier@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cba5b1c6

kernel/events/core.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -7948,9 +7948,11 @@ int perf_event_init_task(struct task_struct *child) 




	for_each_task_context_nr(ctxn) {

	for_each_task_context_nr(ctxn) {

		ret = perf_event_init_context(child, ctxn);

		ret = perf_event_init_context(child, ctxn);

		if (ret)

		if (ret) {

			perf_event_free_task(child);

			return ret;

			return ret;

		}

		}

	}





	return 0;

	return 0;

}

}

kernel/fork.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1360,7 +1360,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
		goto bad_fork_cleanup_policy;

		goto bad_fork_cleanup_policy;

	retval = audit_alloc(p);

	retval = audit_alloc(p);

	if (retval)

	if (retval)

		goto bad_fork_cleanup_policy;

		goto bad_fork_cleanup_perf;

	/* copy all the process information */

	/* copy all the process information */

	shm_init_task(p);

	shm_init_task(p);

	retval = copy_semundo(clone_flags, p);

	retval = copy_semundo(clone_flags, p);
@@ -1566,8 +1566,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
	exit_sem(p);

	exit_sem(p);

bad_fork_cleanup_audit:

bad_fork_cleanup_audit:

	audit_free(p);

	audit_free(p);

bad_fork_cleanup_policy:

bad_fork_cleanup_perf:

	perf_event_free_task(p);

	perf_event_free_task(p);

bad_fork_cleanup_policy:

#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

	mpol_put(p->mempolicy);

	mpol_put(p->mempolicy);

bad_fork_cleanup_threadgroup_lock:

bad_fork_cleanup_threadgroup_lock: