From: Laura Abbott <labbott@redhat.com>
To: Alexander Potapenko <glider@google.com>
Cc: Laura Abbott <labbott@redhat.com>,
kernel test robot <rong.a.chen@intel.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
Christoph Lameter <cl@linux.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Kostya Serebryany <kcc@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Sandeep Patil <sspatil@android.com>,
Randy Dunlap <rdunlap@infradead.org>,
Jann Horn <jannh@google.com>, Mark Rutland <mark.rutland@arm.com>,
Marco Elver <elver@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>, LKP <lkp@01.org>,
linux-mm@kvack.org
Subject: [PATCH] mm: slub: Fix slab walking for init_on_free
Date: Wed, 31 Jul 2019 15:32:40 -0400 [thread overview]
Message-ID: <20190731193240.29477-1-labbott@redhat.com> (raw)
In-Reply-To: <CAG_fn=VBGE=YvkZX0C45qu29zqfvLMP10w_owj4vfFxPcK5iow@mail.gmail.com>
To properly clear the slab on free with slab_want_init_on_free,
we walk the list of free objects using get_freepointer/set_freepointer.
The value we get from get_freepointer may not be valid. This
isn't an issue since an actual value will get written later
but this means there's a chance of triggering a bug if we use
this value with set_freepointer:
[ 4.478342] kernel BUG at mm/slub.c:306!
[ 4.482437] invalid opcode: 0000 [#1] PREEMPT PTI
[ 4.485750] CPU: 0 PID: 0 Comm: swapper Not tainted 5.2.0-05754-g6471384a #4
[ 4.490635] RIP: 0010:kfree+0x58a/0x5c0
[ 4.493679] Code: 48 83 05 78 37 51 02 01 0f 0b 48 83 05 7e 37 51 02 01 48 83 05 7e 37 51 02 01 48 83 05 7e 37 51 02 01 48 83 05 d6 37 51 02 01 <0f> 0b 48 83 05 d4 37 51 02 01 48 83 05 d4 37 51 02 01 48 83 05 d4
[ 4.506827] RSP: 0000:ffffffff82603d90 EFLAGS: 00010002
[ 4.510475] RAX: ffff8c3976c04320 RBX: ffff8c3976c04300 RCX: 0000000000000000
[ 4.515420] RDX: ffff8c3976c04300 RSI: 0000000000000000 RDI: ffff8c3976c04320
[ 4.520331] RBP: ffffffff82603db8 R08: 0000000000000000 R09: 0000000000000000
[ 4.525288] R10: ffff8c3976c04320 R11: ffffffff8289e1e0 R12: ffffd52cc8db0100
[ 4.530180] R13: ffff8c3976c01a00 R14: ffffffff810f10d4 R15: ffff8c3976c04300
[ 4.535079] FS: 0000000000000000(0000) GS:ffffffff8266b000(0000) knlGS:0000000000000000
[ 4.540628] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 4.544593] CR2: ffff8c397ffff000 CR3: 0000000125020000 CR4: 00000000000406b0
[ 4.549558] Call Trace:
[ 4.551266] apply_wqattrs_prepare+0x154/0x280
[ 4.554357] apply_workqueue_attrs_locked+0x4e/0xe0
[ 4.557728] apply_workqueue_attrs+0x36/0x60
[ 4.560654] alloc_workqueue+0x25a/0x6d0
[ 4.563381] ? kmem_cache_alloc_trace+0x1e3/0x500
[ 4.566628] ? __mutex_unlock_slowpath+0x44/0x3f0
[ 4.569875] workqueue_init_early+0x246/0x348
[ 4.573025] start_kernel+0x3c7/0x7ec
[ 4.575558] x86_64_start_reservations+0x40/0x49
[ 4.578738] x86_64_start_kernel+0xda/0xe4
[ 4.581600] secondary_startup_64+0xb6/0xc0
[ 4.584473] Modules linked in:
[ 4.586620] ---[ end trace f67eb9af4d8d492b ]---
Fix this by ensuring the value we set with set_freepointer is either NULL
or another value in the chain.
Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
mm/slub.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index e6c030e47364..8834563cdb4b 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1432,7 +1432,9 @@ static inline bool slab_free_freelist_hook(struct kmem_cache *s,
void *old_tail = *tail ? *tail : *head;
int rsize;
- if (slab_want_init_on_free(s))
+ if (slab_want_init_on_free(s)) {
+ void *p = NULL;
+
do {
object = next;
next = get_freepointer(s, object);
@@ -1445,8 +1447,10 @@ static inline bool slab_free_freelist_hook(struct kmem_cache *s,
: 0;
memset((char *)object + s->inuse, 0,
s->size - s->inuse - rsize);
- set_freepointer(s, object, next);
+ set_freepointer(s, object, p);
+ p = object;
} while (object != old_tail);
+ }
/*
* Compiler cannot detect this function can be removed if slab_free_hook()
--
2.21.0
next parent reply other threads:[~2019-07-31 19:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAG_fn=VBGE=YvkZX0C45qu29zqfvLMP10w_owj4vfFxPcK5iow@mail.gmail.com>
2019-07-31 19:32 ` Laura Abbott [this message]
2019-07-31 19:35 ` Matthew Wilcox
2019-07-31 20:04 ` Kees Cook
2019-08-01 11:28 ` Alexander Potapenko
2019-08-03 9:19 ` David Rientjes
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=20190731193240.29477-1-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=jannh@google.com \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lkp@01.org \
--cc=mark.rutland@arm.com \
--cc=ndesaulniers@google.com \
--cc=rdunlap@infradead.org \
--cc=rong.a.chen@intel.com \
--cc=serge@hallyn.com \
--cc=sspatil@android.com \
--cc=torvalds@linux-foundation.org \
--cc=yamada.masahiro@socionext.com \
/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