Commit 57345fa6 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan: inline (un)poison_range and check_invalid_free 

Using (un)poison_range() or check_invalid_free() currently results in
function calls. Move their definitions to mm/kasan/kasan.h and turn them
into static inline functions for hardware tag-based mode to avoid
unneeded function calls.

Link: https://lkml.kernel.org/r/7007955b69eb31b5376a7dc1e0f4ac49138504f2.1606162397.git.andreyknvl@google.com
Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Tested-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Branislav Rankov <Branislav.Rankov@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bffe6907

mm/kasan/hw_tags.c

+0 −21
Original line number Diff line number Diff line
@@ -30,27 +30,6 @@ void __init kasan_init_hw_tags(void) 
	pr_info("KernelAddressSanitizer initialized\n");

}



void poison_range(const void *address, size_t size, u8 value)

{

	hw_set_mem_tag_range(kasan_reset_tag(address),

			round_up(size, KASAN_GRANULE_SIZE), value);

}



void unpoison_range(const void *address, size_t size)

{

	hw_set_mem_tag_range(kasan_reset_tag(address),

			round_up(size, KASAN_GRANULE_SIZE), get_tag(address));

}



bool check_invalid_free(void *addr)

{

	u8 ptr_tag = get_tag(addr);

	u8 mem_tag = hw_get_mem_tag(addr);



	return (mem_tag == KASAN_TAG_INVALID) ||

		(ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag);

}



void kasan_set_free_info(struct kmem_cache *cache,

				void *object, u8 tag)

{

mm/kasan/kasan.h

+31 −5
Original line number Diff line number Diff line
@@ -154,9 +154,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, 
struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache,

						const void *object);



void poison_range(const void *address, size_t size, u8 value);

void unpoison_range(const void *address, size_t size);



#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)



static inline const void *kasan_shadow_to_mem(const void *shadow_addr)
@@ -196,8 +193,6 @@ void print_tags(u8 addr_tag, const void *addr); 
static inline void print_tags(u8 addr_tag, const void *addr) { }

#endif



bool check_invalid_free(void *addr);



void *find_first_bad_addr(void *addr, size_t size);

const char *get_bug_type(struct kasan_access_info *info);

void metadata_fetch_row(char *buffer, void *row);
@@ -278,6 +273,37 @@ static inline u8 random_tag(void) { return hw_get_random_tag(); } 
static inline u8 random_tag(void) { return 0; }

#endif



#ifdef CONFIG_KASAN_HW_TAGS



static inline void poison_range(const void *address, size_t size, u8 value)

{

	hw_set_mem_tag_range(kasan_reset_tag(address),

			round_up(size, KASAN_GRANULE_SIZE), value);

}



static inline void unpoison_range(const void *address, size_t size)

{

	hw_set_mem_tag_range(kasan_reset_tag(address),

			round_up(size, KASAN_GRANULE_SIZE), get_tag(address));

}



static inline bool check_invalid_free(void *addr)

{

	u8 ptr_tag = get_tag(addr);

	u8 mem_tag = hw_get_mem_tag(addr);



	return (mem_tag == KASAN_TAG_INVALID) ||

		(ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag);

}



#else /* CONFIG_KASAN_HW_TAGS */



void poison_range(const void *address, size_t size, u8 value);

void unpoison_range(const void *address, size_t size);

bool check_invalid_free(void *addr);



#endif /* CONFIG_KASAN_HW_TAGS */



/*

 * Exported functions for interfaces called from assembly or from generated

 * code. Declarations here to avoid warning about missing declarations.

CRA Git | Maintained and supported by SUSTech CRA and CCSE