Commit b89933e9 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Morton
Browse files

kasan: move kasan_get_alloc/free_track definitions 

Move the definitions of kasan_get_alloc/free_track() to report_*.c, as
they belong with other the reporting code.

Link: https://lkml.kernel.org/r/0cb15423956889b3905a0174b58782633bbbd72e.1662411799.git.andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarMarco 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6b074349

mm/kasan/generic.c

+0 −21
Original line number Diff line number Diff line
@@ -512,24 +512,3 @@ void kasan_save_free_info(struct kmem_cache *cache, void *object) 
	/* The object was freed and has free track set. */

	*(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK;

}
 


struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,

						void *object)

{

	struct kasan_alloc_meta *alloc_meta;



	alloc_meta = kasan_get_alloc_meta(cache, object);

	if (!alloc_meta)

		return NULL;



	return &alloc_meta->alloc_track;

}



struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

						void *object, u8 tag)

{

	if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREETRACK)

		return NULL;

	/* Free meta must be present with KASAN_SLAB_FREETRACK. */

	return &kasan_get_free_meta(cache, object)->free_track;

}

mm/kasan/report_generic.c

+21 −0
Original line number Diff line number Diff line
@@ -127,6 +127,27 @@ const char *kasan_get_bug_type(struct kasan_report_info *info) 
	return get_wild_bug_type(info);

}



struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,

						void *object)

{

	struct kasan_alloc_meta *alloc_meta;



	alloc_meta = kasan_get_alloc_meta(cache, object);

	if (!alloc_meta)

		return NULL;



	return &alloc_meta->alloc_track;

}



struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

						void *object, u8 tag)

{

	if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREETRACK)

		return NULL;

	/* Free meta must be present with KASAN_SLAB_FREETRACK. */

	return &kasan_get_free_meta(cache, object)->free_track;

}



void kasan_metadata_fetch_row(char *buffer, void *row)

{

	memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW);

mm/kasan/report_tags.c

+12 −0
Original line number Diff line number Diff line
@@ -21,3 +21,15 @@ const char *kasan_get_bug_type(struct kasan_report_info *info) 


	return "invalid-access";

}



struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,

						void *object)

{

	return NULL;

}



struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

						void *object, u8 tag)

{

	return NULL;

}

mm/kasan/tags.c

+0 −12
Original line number Diff line number Diff line
@@ -24,15 +24,3 @@ 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)

{

}
 


struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,

						void *object)

{

	return NULL;

}



struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,

						void *object, u8 tag)

{

	return NULL;

}