Skip to content

Commit

Permalink
exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting
Browse files Browse the repository at this point in the history
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: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: "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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Dec 11, 2014
1 parent 6c66e7d commit 24c037e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions kernel/pid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 24c037e

Please sign in to comment.