Re: [RESEND][PATCH] proc: Fix timerslack_ns CAP_SYS_NICE check when adjusting self

From: Andrew Morton
Date: Tue Aug 30 2016 - 19:06:12 EST


On Tue, 30 Aug 2016 18:46:23 -0400 Kees Cook <keescook@xxxxxxxxxxxx> wrote:

> On Mon, Aug 22, 2016 at 7:01 PM, John Stultz <john.stultz@xxxxxxxxxx> wrote:
> > In changing from checking ptrace_may_access(p, PTRACE_MODE_ATTACH_FSCREDS)
> > to capable(CAP_SYS_NICE), I missed that ptrace_my_access succeeds
> > when p == current, but the CAP_SYS_NICE doesn't.
> >
> > Thus while the previous commit was intended to loosen the needed
> > privledges to modify a processes timerslack, it needlessly restricted
> > a task modifying its own timerslack via the proc/<tid>/timerslack_ns
> > (which is permitted also via the PR_SET_TIMERSLACK method).
> >
> > This patch corrects this by checking if p == current before checking
> > the CAP_SYS_NICE value.
> >
> > This patch applies on top of my two previous patches currently in -mm
> >
> > Cc: Kees Cook <keescook@xxxxxxxxxxxx>
> > Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx>
> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> > CC: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
> > Cc: Oren Laadan <orenl@xxxxxxxxxxx>
> > Cc: Ruchi Kandoi <kandoiruchi@xxxxxxxxxx>
> > Cc: Rom Lemarchand <romlem@xxxxxxxxxxx>
> > Cc: Todd Kjos <tkjos@xxxxxxxxxx>
> > Cc: Colin Cross <ccross@xxxxxxxxxxx>
> > Cc: Nick Kralevich <nnk@xxxxxxxxxx>
> > Cc: Dmitry Shmidt <dimitrysh@xxxxxxxxxx>
> > Cc: Elliott Hughes <enh@xxxxxxxxxx>
> > Cc: Android Kernel Team <kernel-team@xxxxxxxxxxx>
> > Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
> > Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
>
> Andrew, can you take this for v4.8?

Well, it fixes
proc-relax-proc-tid-timerslack_ns-capability-requirements.patch,
somewhat. And it textually depends on that.

Do we want all of

proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
proc-fix-timerslack_ns-cap_sys_nice-check-when-adjusting-self.patch

in 4.8? If so, why?