From: "Lin, Zhenpeng" <zplin@psu.edu>
To: Kees Cook <keescook@chromium.org>
Cc: Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vlastimil Babka <vbabka@suse.cz>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] slub: choose the right freelist pointer location when creating small caches
Date: Tue, 8 Jun 2021 18:33:01 +0000 [thread overview]
Message-ID: <F9847E9B-5557-4FAC-AE80-829D0AD712A3@psu.edu> (raw)
In-Reply-To: <202106081125.E2DA4DE8@keescook>
There do exist objects whose size is smaller than 2*sizeof(void*). E.g. struct ccid in DCCP module.
On 6/8/21, 2:26 PM, "Kees Cook" <keescook@chromium.org> wrote:
On Sat, Jun 05, 2021 at 01:58:13AM +0000, Lin, Zhenpeng wrote:
> When enabling CONFIG_SLUB_DEBUG and booting with "slub_debug=Z", the
> kernel crashes at creating caches if the object size is smaller
> than 2*sizeof(void*). The problem is due to the wrong calculation
> of freepointer_area. The freelist pointer can be stored in the
> middle of object only if the object size is not smaller than
> 2*sizeof(void*). Otherwise, the freelist pointer will be corrupted by
> SLUB_RED_ZONE.
>
> Fixes: 3202fa62fb43 ("slub: relocate freelist pointer to middle of object")
> Fixes: 89b83f282d8b ("slub: avoid redzone when choosing freepointer location")
> Signed-off-by: Zhenpeng Lin <zplin@psu.edu>
> ---
> mm/slub.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/slub.c b/mm/slub.c
> index 3f96e099817a..cb23233ee683 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -3704,7 +3704,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
> * can't use that portion for writing the freepointer, so
> * s->offset must be limited within this for the general case.
> */
> - freepointer_area = size;
> + freepointer_area = s->object_size;
>
> #ifdef CONFIG_SLUB_DEBUG
> /*
> @@ -3751,7 +3751,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
> */
> s->offset = size;
> size += sizeof(void *);
> - } else if (freepointer_area > sizeof(void *)) {
> + } else if (freepointer_area >= 2 * sizeof(void *)) {
> /*
> * Store freelist pointer near middle of object to keep
> * it away from the edges of the object to avoid small
> --
> 2.17.1
NAK, I'd prefer this get cleaned up more completely, especially since
there are no objects of that size in the kernel currently:
https://nam10.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2F20201015033712.1491731-1-keescook%40chromium.org%2F&data=04%7C01%7Czplin%40psu.edu%7C28b6f3c5a3b149be56e808d92aaafd26%7C7cf48d453ddb4389a9c1c115526eb52e%7C0%7C0%7C637587736155493816%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2F8CXVkqlhA7RnfX%2BDP07%2F4t1NIw1CHsUpuuWrsLyU9o%3D&reserved=0
--
Kees Cook
next prev parent reply other threads:[~2021-06-08 18:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 1:58 [PATCH] slub: choose the right freelist pointer location when creating small caches Lin, Zhenpeng
2021-06-08 18:26 ` Kees Cook
2021-06-08 18:33 ` Lin, Zhenpeng [this message]
2021-06-08 18:41 ` Kees Cook
2021-06-08 19:06 ` Lin, Zhenpeng
2021-06-08 23:14 ` Kees Cook
2021-06-10 20:20 ` Lin, Zhenpeng
2021-06-10 23:01 ` Kees Cook
2021-06-11 4:22 ` Lin, Zhenpeng
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=F9847E9B-5557-4FAC-AE80-829D0AD712A3@psu.edu \
--to=zplin@psu.edu \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--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;
as well as URLs for NNTP newsgroup(s).