diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-29 16:24:02 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-29 16:24:02 -1000 |
| commit | 7fbaacafbc55c56ca156a628a805f79a2cbe7103 (patch) | |
| tree | 44e51d470b075f4c5e11f1b3a54ad8c526387892 /lib | |
| parent | 9251e3e93cf2892641539c184294838adedae415 (diff) | |
| parent | 704573851b51808b45dae2d62059d1d8189138a2 (diff) | |
| download | lwn-7fbaacafbc55c56ca156a628a805f79a2cbe7103.tar.gz lwn-7fbaacafbc55c56ca156a628a805f79a2cbe7103.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/slub_kunit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c index 80e39f003344..33564f965958 100644 --- a/lib/slub_kunit.c +++ b/lib/slub_kunit.c @@ -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(); |