Andrey Ryabinin <a.ryabi...@samsung.com> writes: > 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: Andrey Ryabinin <a.ryabi...@samsung.com> > Cc: Dmitry Vyukov <dvyu...@google.com> > Cc: Rusty Russell <ru...@rustcorp.com.au>
Acked-by: Rusty Russell <ru...@rustcorp.com.au> Thanks, Rusty. > --- > include/linux/kasan.h | 4 ---- > include/linux/moduleloader.h | 8 ++++++++ > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 5fa48a2..5bb0744 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -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) {} > diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h > index f755626..4d0cb9b 100644 > --- a/include/linux/moduleloader.h > +++ b/include/linux/moduleloader.h > @@ -84,4 +84,12 @@ void module_arch_cleanup(struct module *mod); > > /* Any cleanup before freeing mod->module_init */ > void module_arch_freeing_init(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 > -- > 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/