From: Feng Tang <feng.tang@intel.com>
To: "andrey.konovalov@linux.dev" <andrey.konovalov@linux.dev>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Andrey Konovalov <andreyknvl@gmail.com>,
Marco Elver <elver@google.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vlastimil Babka <vbabka@suse.cz>,
"kasan-dev@googlegroups.com" <kasan-dev@googlegroups.com>,
Evgenii Stepanov <eugenis@google.com>,
Oscar Salvador <osalvador@suse.de>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrey Konovalov <andreyknvl@google.com>
Subject: Re: [PATCH mm] slub, kasan: improve interaction of KASAN and slub_debug poisoning
Date: Thu, 23 Nov 2023 20:39:30 +0800 [thread overview]
Message-ID: <ZV9IAnfUHq2lcCe0@feng-clx> (raw)
In-Reply-To: <ZV7whSufeIqslzzN@feng-clx>
On Thu, Nov 23, 2023 at 02:26:13PM +0800, Tang, Feng wrote:
[...]
> > -#ifdef CONFIG_KASAN_GENERIC
> > /*
> > - * KASAN could save its free meta data in object's data area at
> > - * offset 0, if the size is larger than 'orig_size', it will
> > - * overlap the data redzone in [orig_size+1, object_size], and
> > - * the check should be skipped.
> > + * KASAN can save its free meta data inside of the object at offset 0.
> > + * If this meta data size is larger than 'orig_size', it will overlap
> > + * the data redzone in [orig_size+1, object_size]. Thus, we adjust
> > + * 'orig_size' to be as at least as big as KASAN's meta data.
> > */
> > - if (kasan_metadata_size(s, true) > orig_size)
> > - orig_size = s->object_size;
> > -#endif
> > + kasan_meta_size = kasan_metadata_size(s, true);
> > + if (kasan_meta_size > orig_size)
> > + orig_size = kasan_meta_size;
>
> 'orig_size' is to save the orignal request size for kmalloc object,
> and its main purpose is to detect the memory wastage of kmalloc
> objects, see commit 6edf2576a6cc "mm/slub: enable debugging memory
> wasting of kmalloc"
>
> Setting "orig_size = s->object_size" was to skip the wastage check
> and the redzone sanity check for this 'wasted space'.
>
> So it's better not to set 'kasan_meta_size' to orig_size.
>
> And from the below code, IIUC, the orig_size is not used in fixing
> the boot problem found by Hyeonggon?
I just tried Hyeonggon's reproducing method [1], and confirmed the
below change of check_object() itself can fix the problem.
[1]. https://lore.kernel.org/lkml/CAB=+i9RnOz0jDockOfw3oNageCUF5gmF+nzOzPpoTxtr7eqn7g@mail.gmail.com/
Thanks,
Feng
>
> Thanks,
> Feng
>
> >
> > p += get_info_end(s);
> > p += sizeof(struct track) * 2;
> > @@ -1192,7 +1192,7 @@ static int check_object(struct kmem_cache *s, struct slab *slab,
> > {
> > u8 *p = object;
> > u8 *endobject = object + s->object_size;
> > - unsigned int orig_size;
> > + unsigned int orig_size, kasan_meta_size;
> >
> > if (s->flags & SLAB_RED_ZONE) {
> > if (!check_bytes_and_report(s, slab, object, "Left Redzone",
> > @@ -1222,12 +1222,23 @@ static int check_object(struct kmem_cache *s, struct slab *slab,
> > }
> >
> > if (s->flags & SLAB_POISON) {
> > - if (val != SLUB_RED_ACTIVE && (s->flags & __OBJECT_POISON) &&
> > - (!check_bytes_and_report(s, slab, p, "Poison", p,
> > - POISON_FREE, s->object_size - 1) ||
> > - !check_bytes_and_report(s, slab, p, "End Poison",
> > - p + s->object_size - 1, POISON_END, 1)))
> > - return 0;
> > + if (val != SLUB_RED_ACTIVE && (s->flags & __OBJECT_POISON)) {
> > + /*
> > + * KASAN can save its free meta data inside of the
> > + * object at offset 0. Thus, skip checking the part of
> > + * the redzone that overlaps with the meta data.
> > + */
> > + kasan_meta_size = kasan_metadata_size(s, true);
> > + if (kasan_meta_size < s->object_size - 1 &&
> > + !check_bytes_and_report(s, slab, p, "Poison",
> > + p + kasan_meta_size, POISON_FREE,
> > + s->object_size - kasan_meta_size - 1))
> > + return 0;
> > + if (kasan_meta_size < s->object_size &&
> > + !check_bytes_and_report(s, slab, p, "End Poison",
> > + p + s->object_size - 1, POISON_END, 1))
> > + return 0;
> > + }
> > /*
> > * check_pad_bytes cleans up on its own.
> > */
> > --
> > 2.25.1
> >
next prev parent reply other threads:[~2023-11-23 12:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 23:12 andrey.konovalov
2023-11-23 0:39 ` Hyeonggon Yoo
2023-11-23 2:30 ` Andrey Konovalov
2023-11-23 2:58 ` Hyeonggon Yoo
2023-11-23 3:13 ` Andrey Konovalov
2023-11-23 6:26 ` Feng Tang
2023-11-23 12:39 ` Feng Tang [this message]
2023-11-23 16:12 ` Andrey Konovalov
2023-11-24 0:45 ` Feng Tang
2023-11-27 11:44 ` Vlastimil Babka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZV9IAnfUHq2lcCe0@feng-clx \
--to=feng.tang@intel.com \
--cc=42.hyeyoo@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andrey.konovalov@linux.dev \
--cc=andreyknvl@gmail.com \
--cc=andreyknvl@google.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=osalvador@suse.de \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox