Commit 7fbaacaf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'slab-for-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab 

Pull slab fixes from Vlastimil Babka:

 - Fix for a slub_kunit test warning with MEM_ALLOC_PROFILING_DEBUG (Pei
   Xiao)

 - Fix for a MTE-based KASAN BUG in krealloc() (Qun-Wei Lin)

* tag 'slab-for-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
  mm: krealloc: Fix MTE false alarm in __do_krealloc
  slub/kunit: fix a WARNING due to unwrapped __kmalloc_cache_noprof
parents 9251e3e9 70457385

lib/slub_kunit.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void test_kmalloc_redzone_access(struct kunit *test) 
{

	struct kmem_cache *s = test_kmem_cache_create("TestSlub_RZ_kmalloc", 32,

				SLAB_KMALLOC|SLAB_STORE_USER|SLAB_RED_ZONE);

	u8 *p = __kmalloc_cache_noprof(s, GFP_KERNEL, 18);

	u8 *p = alloc_hooks(__kmalloc_cache_noprof(s, GFP_KERNEL, 18));



	kasan_disable_current();

mm/slab_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags) 
		/* Zero out spare memory. */

		if (want_init_on_alloc(flags)) {

			kasan_disable_current();

			memset((void *)p + new_size, 0, ks - new_size);

			memset(kasan_reset_tag(p) + new_size, 0, ks - new_size);

			kasan_enable_current();

		}