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>
In-Reply-To: <201906201801.9CFC9225@keescook>
From:   Alexander Potapenko <glider@google.com>
Date:   Fri, 21 Jun 2019 12:39:11 +0200
Message-ID: <CAG_fn=VRehbrhvNRg0igZ==YvONug_nAYMqyrOXh3kO2+JaszQ@mail.gmail.com>
Subject: Re: [PATCH -next v2] mm/page_alloc: fix a false memory corruption
To:     Kees Cook <keescook@chromium.org>
Cc:     Qian Cai <cai@lca.pw>, 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 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 and
> > 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 expects t=
he
> > 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 think?
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?

> 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 likely =
a
> >     separate issue as clear_page() should not cause issues with future
> >     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(s=
truct 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