shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: kasan: pass tagged pointers to kasan_save_alloc/free_info

Browse Source 
Pass tagged pointers to kasan_save_alloc/free_info().

This is a preparatory patch to simplify other changes in the series.

Link: https://lkml.kernel.org/r/d5bc48cfcf0dca8269dc3ed863047e4d4d2030f1.1662411799.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Peter Collingbourne <pcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Bug: 254721825
(cherry picked from commit 6b07434980)
Change-Id: Icf803ab7498227c0bd725ffaba018249488635f5
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
Andrey Konovalov
2022-09-05 23:05:34 +02:00
parent 466842d721
commit a906fb7c4d
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mm/kasan/common.c
View File

@@ -192,13 +192,11 @@ void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache,
static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
unsigned long ip, bool quarantine, bool init)
{
u8 tag;
void *tagged_object;
if (!kasan_arch_is_ready())
return false;
tag = get_tag(object);
tagged_object = object;
object = kasan_reset_tag(object);
@@ -227,7 +225,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
return false;
if (kasan_stack_collection_enabled())
kasan_save_free_info(cache, object, tag);
kasan_save_free_info(cache, tagged_object);
return kasan_quarantine_put(cache, object);
}
@@ -314,7 +312,7 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache,
/* Save alloc info (if possible) for non-kmalloc() allocations. */
if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc)
kasan_save_alloc_info(cache, (void *)object, flags);
kasan_save_alloc_info(cache, tagged_object, flags);
return tagged_object;
}

3
mm/kasan/generic.c
View File

@@ -500,8 +500,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
kasan_set_track(&alloc_meta->alloc_track, flags);
}
void kasan_save_free_info(struct kmem_cache *cache,
void *object, u8 tag)
void kasan_save_free_info(struct kmem_cache *cache, void *object)
{
struct kasan_free_meta *free_meta;

2
mm/kasan/kasan.h
View File

@@ -306,7 +306,7 @@ static inline void kasan_init_object_meta(struct kmem_cache *cache, const void *
depot_stack_handle_t kasan_save_stack(gfp_t flags, bool can_alloc);
void kasan_set_track(struct kasan_track *track, gfp_t flags);
void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags);
void kasan_save_free_info(struct kmem_cache *cache, void *object, u8 tag);
void kasan_save_free_info(struct kmem_cache *cache, void *object);
struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
void *object);
struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

3
mm/kasan/tags.c
View File

@@ -21,8 +21,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
{
}
void kasan_save_free_info(struct kmem_cache *cache,
void *object, u8 tag)
void kasan_save_free_info(struct kmem_cache *cache, void *object)
{
}