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

Commit 24c037eb authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting 



alloc_pid() does get_pid_ns() beforehand but forgets to put_pid_ns() if it
fails because disable_pid_allocation() was called by the exiting
child_reaper.

We could simply move get_pid_ns() down to successful return, but this fix
tries to be as trivial as possible.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Reviewed-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Aaron Tomlin <atomlin@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
Cc: Sterling Alexander <stalexan@redhat.com>
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 6c66e7db

kernel/pid.c

+2 −0
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ struct pid *alloc_pid(struct pid_namespace *ns) 


out_unlock:

	spin_unlock_irq(&pidmap_lock);

	put_pid_ns(ns);



out_free:

	while (++i <= ns->level)

		free_pidmap(pid->numbers + i);