Greg Kroah-Hartman <[email protected]> writes:
> 4.9-stable review patch. If anyone has any objections, please let me
> know.
No objections but if you are grabbing that one please check if you
have it's follow on fix.
c0ee554906c3 ("pid: Handle failure to allocate the first pid in a pid
namespace")
There were a few cases not handled but the fix below, that made a more
comprehensive fix desirable.
Eric
> ------------------
>
> From: Kirill Tkhai <[email protected]>
>
>
> [ Upstream commit 8896c23d2ef803f1883fea73117a435925c2b4c4 ]
>
> alloc_pidmap() advances pid_namespace::last_pid. When first pid
> allocation fails, then next created process will have pid 2 and
> pid_ns_prepare_proc() won't be called. So, pid_namespace::proc_mnt will
> never be initialized (not to mention that there won't be a child
> reaper).
>
> I saw crash stack of such case on kernel 3.10:
>
> BUG: unable to handle kernel NULL pointer dereference at (null)
> IP: proc_flush_task+0x8f/0x1b0
> Call Trace:
> release_task+0x3f/0x490
> wait_consider_task.part.10+0x7ff/0xb00
> do_wait+0x11f/0x280
> SyS_wait4+0x7d/0x110
>
> We may fix this by restore of last_pid in 0 or by prohibiting of futher
> allocations. Since there was a similar issue in Oleg Nesterov's commit
> 314a8ad0f18a ("pidns: fix free_pid() to handle the first fork failure").
> and it was fixed via prohibiting allocation, let's follow this way, and
> do the same.
>
> Link:
> http://lkml.kernel.org/r/149201021004.4863.6762095011554287922.stgit@localhost.localdomain
> Signed-off-by: Kirill Tkhai <[email protected]>
> Acked-by: Cyrill Gorcunov <[email protected]>
> Cc: Andrei Vagin <[email protected]>
> Cc: Andreas Gruenbacher <[email protected]>
> Cc: Kees Cook <[email protected]>
> Cc: Michael Kerrisk <[email protected]>
> Cc: Al Viro <[email protected]>
> Cc: Oleg Nesterov <[email protected]>
> Cc: Paul Moore <[email protected]>
> Cc: Eric Biederman <[email protected]>
> Cc: Andy Lutomirski <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Serge Hallyn <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> Signed-off-by: Linus Torvalds <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> kernel/pid.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> --- a/kernel/pid.c
> +++ b/kernel/pid.c
> @@ -322,8 +322,10 @@ struct pid *alloc_pid(struct pid_namespa
> }
>
> if (unlikely(is_child_reaper(pid))) {
> - if (pid_ns_prepare_proc(ns))
> + if (pid_ns_prepare_proc(ns)) {
> + disable_pid_allocation(ns);
> goto out_free;
> + }
> }
>
> get_pid_ns(ns);
