Skip to content

Commit 9ef8568

Browse files
ftang1tehcaster
authored andcommitted
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>
1 parent b6da940 commit 9ef8568

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

mm/slub.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,9 @@ static inline unsigned int get_orig_size(struct kmem_cache *s, void *object)
768768
{
769769
void *p = kasan_reset_tag(object);
770770

771+
if (is_kfence_address(object))
772+
return kfence_ksize(object);
773+
771774
if (!slub_debug_orig_size(s))
772775
return s->object_size;
773776

0 commit comments

Comments
 (0)