diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2022-12-01 00:10:46 +0100 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2022-12-01 00:10:46 +0100 |
| commit | 617666521385ba1a07f9388bc80d24941104e412 (patch) | |
| tree | 434078dc54a9002c14eecc85da6345415a464401 /mm/slab.h | |
| parent | b5e72d27e39a092c956b34b286f6564ceee4134c (diff) | |
| parent | 6cd6d33ca41ff4af21bc25c331ab34b50b4a9c8c (diff) | |
Merge branch 'slab/for-6.2/kmalloc_redzone' into slab/for-next
Add a new slub_kunit test for the extended kmalloc redzone check, by
Feng Tang. Also prevent unwanted kfence interaction with all slub kunit
tests.
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/slab.h b/mm/slab.h index e3b3231af742..060c589a827a 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -346,7 +346,8 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, SLAB_ACCOUNT) #elif defined(CONFIG_SLUB) #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE | SLAB_RECLAIM_ACCOUNT | \ - SLAB_TEMPORARY | SLAB_ACCOUNT | SLAB_NO_USER_FLAGS) + SLAB_TEMPORARY | SLAB_ACCOUNT | \ + SLAB_NO_USER_FLAGS | SLAB_KMALLOC) #else #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE) #endif @@ -366,6 +367,7 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, SLAB_RECLAIM_ACCOUNT | \ SLAB_TEMPORARY | \ SLAB_ACCOUNT | \ + SLAB_KMALLOC | \ SLAB_NO_USER_FLAGS) bool __kmem_cache_empty(struct kmem_cache *); |