Skip to content

Commit c813111

Browse files
committed
Merge tag 'slab-fixes-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab fix from Vlastimil Babka: "Since v6.8 we've had a subtle breakage in SLUB with KFENCE enabled, that can cause a crash. It hasn't been found earlier due to quite specific conditions necessary (OOM during kmem_cache_alloc_bulk())" * tag 'slab-fixes-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab: mm, slub: do not call do_slab_free for kfence object
2 parents de9c2c6 + a371d55 commit c813111

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

mm/slub.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4690,6 +4690,9 @@ static void __kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p)
46904690
if (!df.slab)
46914691
continue;
46924692

4693+
if (kfence_free(df.freelist))
4694+
continue;
4695+
46934696
do_slab_free(df.s, df.slab, df.freelist, df.tail, df.cnt,
46944697
_RET_IP_);
46954698
} while (likely(size));

0 commit comments

Comments
 (0)