Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2713a8ca authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Alex Shi
Browse files

kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h> 



include/linux/moduleloader.h is more suitable place for this macro.
Also change alignment to PAGE_SIZE for CONFIG_KASAN=n as such
alignment already assumed in several places.

Signed-off-by: default avatarAndrey Ryabinin <a.ryabinin@samsung.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d3733e5c98e952d419e77fa721912f09d15a2806)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent a0cc0c59

include/linux/kasan.h

+0 −4
Original line number Diff line number Diff line
@@ -50,15 +50,11 @@ void kasan_krealloc(const void *object, size_t new_size); 
void kasan_slab_alloc(struct kmem_cache *s, void *object);

void kasan_slab_free(struct kmem_cache *s, void *object);



#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)



int kasan_module_alloc(void *addr, size_t size);

void kasan_free_shadow(const struct vm_struct *vm);



#else /* CONFIG_KASAN */



#define MODULE_ALIGN 1



static inline void kasan_unpoison_shadow(const void *address, size_t size) {}



static inline void kasan_enable_current(void) {}

include/linux/moduleloader.h

+7 −0
Original line number Diff line number Diff line
@@ -82,4 +82,11 @@ int module_finalize(const Elf_Ehdr *hdr, 
/* Any cleanup needed when module leaves. */

void module_arch_cleanup(struct module *mod);



#ifdef CONFIG_KASAN

#include <linux/kasan.h>

#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)

#else

#define MODULE_ALIGN PAGE_SIZE

#endif



#endif