[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGXu5jJgFrWajK5m8ev72DV9ueznLnbGV2-UGECnz0iZ_EFDUg@mail.gmail.com>
Date: Wed, 5 Dec 2018 17:00:34 -0800
From: Kees Cook <keescook@...omium.org>
To: "Eric W. Biederman" <ebiederm@...ssion.com>,
Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Tycho Andersen <tycho@...ho.ws>,
Thomas Gleixner <tglx@...utronix.de>,
Oleg Nesterov <oleg@...hat.com>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: siginfo pid not populated from ptrace?
On Sat, Dec 1, 2018 at 7:04 AM Eric W. Biederman <ebiederm@...ssion.com> wrote:
>
> Kees Cook <keescook@...omium.org> writes:
>
> > On Tue, Nov 27, 2018 at 8:44 PM Eric W. Biederman <ebiederm@...ssion.com> wrote:
> >>
> >> Kees Cook <keescook@...omium.org> writes:
> >>
> >> > On Tue, Nov 27, 2018 at 4:38 PM, Kees Cook <keescook@...omium.org> wrote:
> >> >> On Tue, Nov 27, 2018 at 3:21 PM, Tycho Andersen <tycho@...ho.ws> wrote:
> >> >>> On Mon, Nov 12, 2018 at 12:24:43PM -0700, Tycho Andersen wrote:
> >> >>>> On Mon, Nov 12, 2018 at 11:55:38AM -0700, Tycho Andersen wrote:
> >> >>>> > I haven't manage to reproduce it on stock v4.20-rc2, unfortunately.
> >> >>>>
> >> >>>> Ok, now I have,
> >> >>>>
> >> >>>> seccomp_bpf.c:2736:global.syscall_restart:Expected getpid() (1493) == info._sifields._kill.si_pid (0)
> >> >>>> global.syscall_restart: Test failed at step #22
> >> >>>
> >> >>> Seems like this is still happening on v4.20-rc4,
> >> >>>
> >> >>> [ RUN ] global.syscall_restart
> >> >>> seccomp_bpf.c:2736:global.syscall_restart:Expected getpid() (1901) == info._sifields._kill.si_pid (0)
> >> >>> global.syscall_restart: Test failed at step #22
> >> >>
> >> >> This fails every time for me -- is it still racey for you?
> >> >>
> >> >> I'm attempting a bisect, hoping it doesn't _become_ racey for me. ;)
> >> >
> >> > This bisects to here for me:
> >> >
> >> > commit f149b31557446aff9ca96d4be7e39cc266f6e7cc
> >> > Author: Eric W. Biederman <ebiederm@...ssion.com>
> >> > Date: Mon Sep 3 09:50:36 2018 +0200
> >> >
> >> > signal: Never allocate siginfo for SIGKILL or SIGSTOP
> >> >
> >> > The SIGKILL and SIGSTOP signals are never delivered to userspace so
> >> > queued siginfo for these signals can never be observed. Therefore
> >> > remove the chance of failure by never even attempting to allocate
> >> > siginfo in those cases.
> >> >
> >> > Reviewed-by: Thomas Gleixner <tglx@...utronix.de>
> >> > Signed-off-by: "Eric W. Biederman" <ebiederm@...ssion.com>
> >> >
> >> > They are certainly visible via seccomp ;)
> >>
> >> Well SIGSTOP is visible via PTRACE_GETSIGINFO.
> >>
> >> I see what is happening now. Since we don't have queued siginfo
> >> we generate some as:
> >> /*
> >> * Ok, it wasn't in the queue. This must be
> >> * a fast-pathed signal or we must have been
> >> * out of queue space. So zero out the info.
> >> */
> >> clear_siginfo(info);
> >> info->si_signo = sig;
> >> info->si_errno = 0;
> >> info->si_code = SI_USER;
> >> info->si_pid = 0;
> >> info->si_uid = 0;
> >>
> >> Which allows last_signfo to be set,
> >> so despite not really having any siginfo PTRACE_GET_SIGINFO
> >> has something to return so does not return -EINVAL.
> >>
> >> Reconstructing my context that was part of removing SEND_SIG_FORCED
> >> so this looks like it will take a little more than a revert to fix
> >> this.
> >>
> >> This is definitely a change that is visible to user space. The logic in
> >> my patch was definitely wrong with respect to SIGSTOP and
> >> PTRACE_GETSIGINFO. Is there something in userspace that actually cares?
> >> AKA is the idiom that the test seccomp_bpf.c is using something that
> >> non-test code does?
> >
> > I think this would be needed by any ptracer that handled multiple
> > threads. It needs to figure out which pid stopped. I think it's worth
> > fixing, yes.
> >
> >> The change below should restore the old behavior. I am just wondering
> >> if this is something we want to do. siginfo is allocated with
> >> GFP_ATOMIC so if your machine is under memory pressure there is a real
> >> chance the allocation can fail. Which would cause whatever is breaking
> >> now to break less deterministically then.
> >
> > I think memory pressure that would block a 128 byte GFP_ATOMIC
> > allocation would mean the system was about to seriously fall over.
> > Given the user-facing behavior change and that an existing test was
> > already checking for this means we need to fix it.
>
> That sounds good but it is all rubbish.
> A) It doesn't matter for tracing multiple processes because ptrace
> only works on a single signal at a time. AKA if by the time you
> are calling PTRACE_GETSIGINFO you already know which process you are
> working against.
> B) Not every signal includes si_pid so even if you didn't know who you
> were talking to this would be an issue.
> C) For a non-rt signal we only every try and queue up a signal signal.
> We don't even attempt to queue siginfo otherwise.
Fair enough, all true.
> So what is the real world use case?
A quick search didn't show anything I could find (looking for
combinations of PTRACE_GETSIGINFO and si_pid use around a SIGSTOP).
That doesn't mean it doesn't exist, though. The reason seccomp's
selftests are so extensive is because we've had some very
corner-case[1] bugs in real-world software.
> The most useful I can think of is the whole check if this tracer was the
> one who sent SIGSTOP. But that is fundamentally unreliable because we
> only queue a single signal anyway. We must to that to preserve
> compatibility for non-rt signals as otherwise there are cases we could
> queue the same signal twice. So with two simultaneous SIGSTOPs it is a
> race condition which siginfo is made available.
Understood. However, the point of the seccomp test is for making sure
that the ordering of the controlled test gets us the right pattern of
events across a syscall interruption when seccomp is filtering. This
is about making sure nothing around the restart changes since this
could impact seccomp filters in the wild.
> Right now we are on the edge of letting test cases for debug
> infrastructure prevent obvious optimizations/improvements to the code.
> So if we can find something other than our seccomp_bpf.c test case that
> fails I am happy to go with the change I posted. Otherwise I think we
> just need to fix seccomp_bpf.c.
I wouldn't call this "debug infrastructure": they are behavioral test
cases for seccomp, syscall, and ptrace interaction, and even this one
has found bugs (see the "FIXME" note a few lines down, that remains
unsolved[2] in arm32).
If this actually doesn't count as breaking userspace, then okay, sure,
I'll drop the sanity check in the seccomp selftest. But it feels wrong
to me.
-Kees
[1] 485a252a5559 ("seccomp: Fix tracer exit notifications during fatal signals")
[2] http://lkml.kernel.org/r/CAGXu5jKzif=vp6gn5ZtrTx-JTN367qFphobnt9s=awbaafwoUw@mail.gmail.com
--
Kees Cook
Powered by blists - more mailing lists