diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-04-28 04:48:27 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-04-28 04:48:30 +0300 |
| commit | 49caedb668e476c100d727f2174724e0610a2b92 (patch) | |
| tree | 7169ad544c5c1aa0303104785f9c4bb377198030 /mm/slab_common.c | |
| parent | bec70691aa671f98adc78960c080f41f28c7040f (diff) | |
| parent | 45451e8015a91de5d1a512c3e3d7373bbcb58fb0 (diff) | |
| download | linux-49caedb668e476c100d727f2174724e0610a2b92.tar.xz | |
Merge tag 'v5.15.36' into dev-5.15
This is the 5.15.36 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index ec2bb0beed75..022319e7deaf 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -568,6 +568,13 @@ bool kmem_valid_obj(void *object) } EXPORT_SYMBOL_GPL(kmem_valid_obj); +static void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct page *page) +{ + if (__kfence_obj_info(kpp, object, page)) + return; + __kmem_obj_info(kpp, object, page); +} + /** * kmem_dump_obj - Print available slab provenance information * @object: slab object for which to find provenance information. @@ -603,6 +610,8 @@ void kmem_dump_obj(void *object) pr_cont(" slab%s %s", cp, kp.kp_slab_cache->name); else pr_cont(" slab%s", cp); + if (is_kfence_address(object)) + pr_cont(" (kfence)"); if (kp.kp_objp) pr_cont(" start %px", kp.kp_objp); if (kp.kp_data_offset) |