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: <1561058881-9814-1-git-send-email-cai@lca.pw> <201906201812.8B49A36@keescook>
 <201906201818.6C90BC875@keescook> <1561121745.5154.37.camel@lca.pw>
In-Reply-To: <1561121745.5154.37.camel@lca.pw>
From:   Alexander Potapenko <glider@google.com>
Date:   Tue, 25 Jun 2019 18:16:43 +0200
Message-ID: <CAG_fn=WuEL0ZGdmy3fhY9gW-nBw_qG9_yb3Ut1+17By3h=d0Jg@mail.gmail.com>
Subject: Re: [PATCH -next] slub: play init_on_free=1 well with SLAB_RED_ZONE
To:     Qian Cai <cai@lca.pw>
Cc:     Kees Cook <keescook@chromium.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Christoph Lameter <cl@linux.com>,
        Pekka Enberg <penberg@kernel.org>,
        David Rientjes <rientjes@google.com>,
        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:55 PM Qian Cai <cai@lca.pw> wrote:
>
> On Thu, 2019-06-20 at 18:19 -0700, Kees Cook wrote:
> > On Thu, Jun 20, 2019 at 06:14:33PM -0700, Kees Cook wrote:
> > > On Thu, Jun 20, 2019 at 03:28:01PM -0400, Qian Cai wrote:
> > > > diff --git a/mm/slub.c b/mm/slub.c
> > > > index a384228ff6d3..787971d4fa36 100644
> > > > --- a/mm/slub.c
> > > > +++ b/mm/slub.c
> > > > @@ -1437,7 +1437,7 @@ static inline bool slab_free_freelist_hook(st=
ruct
> > > > kmem_cache *s,
> > > >           do {
> > > >                   object =3D next;
> > > >                   next =3D get_freepointer(s, object);
> > > > -                 memset(object, 0, s->size);
> > > > +                 memset(object, 0, s->object_size);
> > >
> > > I think this should be more dynamic -- we _do_ want to wipe all
> > > of object_size in the case where it's just alignment and padding
> > > adjustments. If redzones are enabled, let's remove that portion only.
> >
> > (Sorry, I meant: all of object's "size", not object_size.)
> >
>
> I suppose Alexander is going to revise the series anyway, so he can proba=
bly
> take care of the issue here in the new version as well. Something like th=
is,
>
> memset(object, 0, s->object_size);
> memset(object, 0, s->size - s->inuse);
Looks like we also need to account for the redzone size. I'm testing
the fix right now.


--
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