diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2022-11-16 17:56:32 +0300 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2022-11-28 01:35:04 +0300 |
| commit | 346907ceb9d11b9e22677c142b45ff50dd20a66a (patch) | |
| tree | a322488eba1e68b6ade9ea8e6e09a1deb784b99b /mm/slab.h | |
| parent | c18c20f16219516b12a4f2fd29c25e06be97e064 (diff) | |
| download | linux-346907ceb9d11b9e22677c142b45ff50dd20a66a.tar.xz | |
mm, slab: ignore hardened usercopy parameters when disabled
With CONFIG_HARDENED_USERCOPY not enabled, there are no
__check_heap_object() checks happening that would use the struct
kmem_cache useroffset and usersize fields. Yet the fields are still
initialized, preventing merging of otherwise compatible caches.
Also the fields contribute to struct kmem_cache size unnecessarily when
unused. Thus #ifdef them out completely when CONFIG_HARDENED_USERCOPY is
disabled. In kmem_dump_obj() print object_size instead of usersize, as
that's actually the intention.
In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfo from 131 to 111.
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Christoph Lameter <cl@linux.com>
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/slab.h b/mm/slab.h index 0202a8c2f0d2..db9a7984e22e 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -207,8 +207,6 @@ struct kmem_cache { unsigned int size; /* The aligned/padded/added on size */ unsigned int align; /* Alignment as calculated */ slab_flags_t flags; /* Active flags on the slab */ - unsigned int useroffset;/* Usercopy region offset */ - unsigned int usersize; /* Usercopy region size */ const char *name; /* Slab name for sysfs */ int refcount; /* Use counter */ void (*ctor)(void *); /* Called on object slot creation */ |