diff options
| author | Feng Tang <feng.tang@intel.com> | 2024-10-16 23:41:50 +0800 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-11-16 21:18:29 +0100 |
| commit | 9ef8568bd7cddf59e1ff6ee1b7d799539e331b73 (patch) | |
| tree | 227e66d7858f0df2a8631d25ca029db15c1eafaf /mm | |
| parent | b6da940130579769a42605b2c7f529b6f14ef1f8 (diff) | |
mm/slub: Consider kfence case for get_orig_size()
When 'orig_size' of kmalloc object is enabled by debug option, it
should either contains the actual requested size or the cache's
'object_size'.
But it's not true if that object is a kfence-allocated one, and the
data at 'orig_size' offset of metadata could be zero or other values.
This is not a big issue for current 'orig_size' usage, as init_object()
and check_object() during alloc/free process will be skipped for kfence
addresses. But it could cause trouble for other usage in future.
Use the existing kfence helper kfence_ksize() which can return the
real original request size.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index 2ccb016c7f99..e186e7a67597 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -768,6 +768,9 @@ static inline unsigned int get_orig_size(struct kmem_cache *s, void *object) { void *p = kasan_reset_tag(object); + if (is_kfence_address(object)) + return kfence_ksize(object); + if (!slub_debug_orig_size(s)) return s->object_size; |