Commit a5af5aa8 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds
Browse files

kasan, module, vmalloc: rework shadow allocation for modules 



Current approach in handling shadow memory for modules is broken.

Shadow memory could be freed only after memory shadow corresponds it is no
longer used.  vfree() called from interrupt context could use memory its
freeing to store 'struct llist_node' in it:

    void vfree(const void *addr)
    {
    ...
        if (unlikely(in_interrupt())) {
            struct vfree_deferred *p = this_cpu_ptr(&vfree_deferred);
            if (llist_add((struct llist_node *)addr, &p->list))
                    schedule_work(&p->wq);

Later this list node used in free_work() which actually frees memory.
Currently module_memfree() called in interrupt context will free shadow
before freeing module's memory which could provoke kernel crash.

So shadow memory should be freed after module's memory.  However, such
deallocation order could race with kasan_module_alloc() in module_alloc().

Free shadow right before releasing vm area.  At this point vfree()'d
memory is not used anymore and yet not available for other allocations.
New VM_KASAN flag used to indicate that vm area has dynamically allocated
shadow memory so kasan frees shadow only if it was previously allocated.

Signed-off-by: default avatarAndrey Ryabinin <a.ryabinin@samsung.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b3c1030d

include/linux/kasan.h

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


struct kmem_cache;

struct page;

struct vm_struct;



#ifdef CONFIG_KASAN
@@ -52,7 +53,7 @@ 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_module_free(void *addr);

void kasan_free_shadow(const struct vm_struct *vm);



#else /* CONFIG_KASAN */
@@ -82,7 +83,7 @@ static inline void kasan_slab_alloc(struct kmem_cache *s, void *object) {} 
static inline void kasan_slab_free(struct kmem_cache *s, void *object) {}



static inline int kasan_module_alloc(void *addr, size_t size) { return 0; }

static inline void kasan_module_free(void *addr) {}

static inline void kasan_free_shadow(const struct vm_struct *vm) {}



#endif /* CONFIG_KASAN */

include/linux/vmalloc.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ 
#define VM_VPAGES		0x00000010	/* buffer for pages was vmalloc'ed */

#define VM_UNINITIALIZED	0x00000020	/* vm_struct is not fully initialized */

#define VM_NO_GUARD		0x00000040      /* don't add guard page */

#define VM_KASAN		0x00000080      /* has allocated kasan shadow memory */

/* bits [20..32] reserved for arch specific ioremap internals */



/*

kernel/module.c

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include <linux/async.h>

#include <linux/percpu.h>

#include <linux/kmemleak.h>

#include <linux/kasan.h>

#include <linux/jump_label.h>

#include <linux/pfn.h>

#include <linux/bsearch.h>
@@ -1814,7 +1813,6 @@ static void unset_module_init_ro_nx(struct module *mod) { } 
void __weak module_memfree(void *module_region)

{

	vfree(module_region);

	kasan_module_free(module_region);

}



void __weak module_arch_cleanup(struct module *mod)

mm/kasan/kasan.c

+11 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/stacktrace.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/vmalloc.h>

#include <linux/kasan.h>



#include "kasan.h"
@@ -414,12 +415,19 @@ int kasan_module_alloc(void *addr, size_t size) 
			GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,

			PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE,

			__builtin_return_address(0));

	return ret ? 0 : -ENOMEM;



	if (ret) {

		find_vm_area(addr)->flags |= VM_KASAN;

		return 0;

	}



	return -ENOMEM;

}



void kasan_module_free(void *addr)

void kasan_free_shadow(const struct vm_struct *vm)

{

	vfree(kasan_mem_to_shadow(addr));

	if (vm->flags & VM_KASAN)

		vfree(kasan_mem_to_shadow(vm->addr));

}



static void register_global(struct kasan_global *global)

mm/vmalloc.c

+1 −0
Original line number Diff line number Diff line
@@ -1418,6 +1418,7 @@ struct vm_struct *remove_vm_area(const void *addr) 
		spin_unlock(&vmap_area_lock);



		vmap_debug_free_range(va->va_start, va->va_end);

		kasan_free_shadow(vm);

		free_unmap_vmap_area(va);

		vm->size -= PAGE_SIZE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE