From: Feng Tang <feng.tang@intel.com>
To: Vlastimil Babka <vbabka@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Roman Gushchin <roman.gushchin@linux.dev>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
Marco Elver <elver@google.com>,
Shuah Khan <skhan@linuxfoundation.org>,
David Gow <davidgow@google.com>,
Danilo Krummrich <dakr@kernel.org>
Cc: linux-mm@kvack.org, kasan-dev@googlegroups.com,
linux-kernel@vger.kernel.org, Feng Tang <feng.tang@intel.com>
Subject: [PATCH 2/5] mm/slub: Consider kfence case for get_orig_size()
Date: Mon, 9 Sep 2024 09:29:55 +0800 [thread overview]
Message-ID: <20240909012958.913438-3-feng.tang@intel.com> (raw)
In-Reply-To: <20240909012958.913438-1-feng.tang@intel.com>
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 its
'orig_size' in 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.
As 'orig_size' will be used by some function block like krealloc(),
handle it by returning the 'object_size' in get_orig_size() for
kfence addresses.
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
mm/slub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/slub.c b/mm/slub.c
index 996a72fa6f62..4cb3822dba08 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -768,7 +768,7 @@ static inline unsigned int get_orig_size(struct kmem_cache *s, void *object)
{
void *p = kasan_reset_tag(object);
- if (!slub_debug_orig_size(s))
+ if (!slub_debug_orig_size(s) || is_kfence_address(object))
return s->object_size;
p += get_info_end(s);
--
2.34.1
next prev parent reply other threads:[~2024-09-09 1:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 1:29 [PATCH 0/5] mm/slub: Improve data handling of krealloc() when orig_size is enabled Feng Tang
2024-09-09 1:29 ` [PATCH 1/5] mm/kasan: Don't store metadata inside kmalloc object when slub_debug_orig_size is on Feng Tang
2024-09-09 16:24 ` Andrey Konovalov
2024-09-10 2:17 ` Feng Tang
2024-09-09 1:29 ` Feng Tang [this message]
2024-09-09 1:29 ` [PATCH 3/5] mm/slub: Improve redzone check and zeroing for krealloc() Feng Tang
2024-09-10 10:06 ` Danilo Krummrich
2024-09-10 13:39 ` Feng Tang
2024-09-10 13:15 ` Vlastimil Babka
2024-09-10 14:18 ` Feng Tang
2024-09-09 1:29 ` [PATCH 4/5] kunit: kfence: Make KFENCE_TEST_REQUIRES macro available for all kunit case Feng Tang
2024-09-10 13:17 ` Vlastimil Babka
2024-09-10 14:14 ` Feng Tang
2024-09-10 14:19 ` Alexander Potapenko
2024-09-10 16:04 ` Marco Elver
2024-09-09 1:29 ` [PATCH 5/5] mm/slub, kunit: Add testcase for krealloc redzone and zeroing Feng Tang
2024-09-10 10:09 ` Danilo Krummrich
2024-09-10 13:29 ` Vlastimil Babka
2024-09-10 14:08 ` Feng Tang
2024-09-09 17:12 ` [PATCH 0/5] mm/slub: Improve data handling of krealloc() when orig_size is enabled Vlastimil Babka
2024-09-10 2:20 ` Feng Tang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240909012958.913438-3-feng.tang@intel.com \
--to=feng.tang@intel.com \
--cc=42.hyeyoo@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=cl@linux.com \
--cc=dakr@kernel.org \
--cc=davidgow@google.com \
--cc=elver@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=skhan@linuxfoundation.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®