diff options
Diffstat (limited to 'mm/kasan')
| -rw-r--r-- | mm/kasan/kasan.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index 78fee632a7ee..936d81661c47 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/stacktrace.h> | 29 | #include <linux/stacktrace.h> |
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/vmalloc.h> | ||
| 32 | #include <linux/kasan.h> | 33 | #include <linux/kasan.h> |
| 33 | 34 | ||
| 34 | #include "kasan.h" | 35 | #include "kasan.h" |
| @@ -414,12 +415,19 @@ int kasan_module_alloc(void *addr, size_t size) | |||
| 414 | GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, | 415 | GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, |
| 415 | PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, | 416 | PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, |
| 416 | __builtin_return_address(0)); | 417 | __builtin_return_address(0)); |
| 417 | return ret ? 0 : -ENOMEM; | 418 | |
| 419 | if (ret) { | ||
| 420 | find_vm_area(addr)->flags |= VM_KASAN; | ||
| 421 | return 0; | ||
| 422 | } | ||
| 423 | |||
| 424 | return -ENOMEM; | ||
| 418 | } | 425 | } |
| 419 | 426 | ||
| 420 | void kasan_module_free(void *addr) | 427 | void kasan_free_shadow(const struct vm_struct *vm) |
| 421 | { | 428 | { |
| 422 | vfree(kasan_mem_to_shadow(addr)); | 429 | if (vm->flags & VM_KASAN) |
| 430 | vfree(kasan_mem_to_shadow(vm->addr)); | ||
| 423 | } | 431 | } |
| 424 | 432 | ||
| 425 | static void register_global(struct kasan_global *global) | 433 | static void register_global(struct kasan_global *global) |