Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1561063566-16335-1-git-send-email-cai@lca.pw> <201906201801.9CFC9225@keescook>
 <CAG_fn=VRehbrhvNRg0igZ==YvONug_nAYMqyrOXh3kO2+JaszQ@mail.gmail.com> <1561119983.5154.33.camel@lca.pw>
In-Reply-To: <1561119983.5154.33.camel@lca.pw>
From:   Alexander Potapenko <glider@google.com>
Date:   Fri, 21 Jun 2019 16:37:10 +0200
Message-ID: <CAG_fn=WGdFZNrUCeMtbx4wbHhxWqM2s7Vq_GvnMC-9WJZ_mioQ@mail.gmail.com>
Subject: Re: [PATCH -next v2] mm/page_alloc: fix a false memory corruption
To:     Qian Cai <cai@lca.pw>
Cc:     Kees Cook <keescook@chromium.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Memory Management List <linux-mm@kvack.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Jun 21, 2019 at 2:26 PM Qian Cai <cai@lca.pw> wrote:
>
> On Fri, 2019-06-21 at 12:39 +0200, Alexander Potapenko wrote:
> > On Fri, Jun 21, 2019 at 3:01 AM Kees Cook <keescook@chromium.org> wrote=
:
> > >
> > > On Thu, Jun 20, 2019 at 04:46:06PM -0400, Qian Cai wrote:
> > > > The linux-next commit "mm: security: introduce init_on_alloc=3D1 an=
d
> > > > init_on_free=3D1 boot options" [1] introduced a false positive when
> > > > init_on_free=3D1 and page_poison=3Don, due to the page_poison expec=
ts the
> > > > pattern 0xaa when allocating pages which were overwritten by
> > > > init_on_free=3D1 with 0.
> > > >
> > > > Fix it by switching the order between kernel_init_free_pages() and
> > > > kernel_poison_pages() in free_pages_prepare().
> > >
> > > Cool; this seems like the right approach. Alexander, what do you thin=
k?
> >
> > Can using init_on_free together with page_poison bring any value at all=
?
> > Isn't it better to decide at boot time which of the two features we're
> > going to enable?
>
> I think the typical use case is people are using init_on_free=3D1, and th=
en decide
> to debug something by enabling page_poison=3Don. Definitely, don't want
> init_on_free=3D1 to disable page_poison as the later has additional check=
ing in
> the allocation time to make sure that poison pattern set in the free time=
 is
> still there.
In addition to information lifetime reduction the idea of init_on_free
is to ensure the newly allocated objects have predictable contents.
Therefore it's handy (although not strictly necessary) to keep them
zero-initialized regardless of other boot-time flags.
Right now free_pages_prezeroed() relies on that, though this can be changed=
.

On the other hand, since page_poison already initializes freed memory,
we can probably make want_init_on_free() return false in that case to
avoid extra initialization.

Side note: if we make it possible to switch betwen 0x00 and 0xAA in
init_on_free mode, we can merge it with page_poison, performing the
initialization depending on a boot-time flag and doing heavyweight
checks under a separate config.

> >
> > > Reviewed-by: Kees Cook <keescook@chromium.org>
> > >
> > > -Kees
> > >
> > > >
> > > > [1] https://patchwork.kernel.org/patch/10999465/
> > > >
> > > > Signed-off-by: Qian Cai <cai@lca.pw>
> > > > ---
> > > >
> > > > v2: After further debugging, the issue after switching order is lik=
ely a
> > > >     separate issue as clear_page() should not cause issues with fut=
ure
> > > >     accesses.
> > > >
> > > >  mm/page_alloc.c | 3 ++-
> > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > > > index 54dacf35d200..32bbd30c5f85 100644
> > > > --- a/mm/page_alloc.c
> > > > +++ b/mm/page_alloc.c
> > > > @@ -1172,9 +1172,10 @@ static __always_inline bool
> > > > free_pages_prepare(struct page *page,
> > > >                                          PAGE_SIZE << order);
> > > >       }
> > > >       arch_free_page(page, order);
> > > > -     kernel_poison_pages(page, 1 << order, 0);
> > > >       if (want_init_on_free())
> > > >               kernel_init_free_pages(page, 1 << order);
> > > > +
> > > > +     kernel_poison_pages(page, 1 << order, 0);
> > > >       if (debug_pagealloc_enabled())
> > > >               kernel_map_pages(page, 1 << order, 0);
> > > >
> > > > --
> > > > 1.8.3.1
> > > >
> > >
> > > --
> > > Kees Cook
> >
> >
> >


--=20
Alexander Potapenko
Software Engineer

Google Germany GmbH
Erika-Mann-Stra=C3=9Fe, 33
80636 M=C3=BCnchen

Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg