| .. | .. |
|---|
| 8 | 8 | #include <linux/ratelimit.h> |
|---|
| 9 | 9 | #include <linux/kasan.h> |
|---|
| 10 | 10 | |
|---|
| 11 | | -static bool want_page_poisoning __read_mostly; |
|---|
| 11 | +bool _page_poisoning_enabled_early; |
|---|
| 12 | +EXPORT_SYMBOL(_page_poisoning_enabled_early); |
|---|
| 13 | +DEFINE_STATIC_KEY_FALSE(_page_poisoning_enabled); |
|---|
| 14 | +EXPORT_SYMBOL(_page_poisoning_enabled); |
|---|
| 12 | 15 | |
|---|
| 13 | 16 | static int __init early_page_poison_param(char *buf) |
|---|
| 14 | 17 | { |
|---|
| 15 | | - if (!buf) |
|---|
| 16 | | - return -EINVAL; |
|---|
| 17 | | - return strtobool(buf, &want_page_poisoning); |
|---|
| 18 | + return kstrtobool(buf, &_page_poisoning_enabled_early); |
|---|
| 18 | 19 | } |
|---|
| 19 | 20 | early_param("page_poison", early_page_poison_param); |
|---|
| 20 | | - |
|---|
| 21 | | -/** |
|---|
| 22 | | - * page_poisoning_enabled - check if page poisoning is enabled |
|---|
| 23 | | - * |
|---|
| 24 | | - * Return true if page poisoning is enabled, or false if not. |
|---|
| 25 | | - */ |
|---|
| 26 | | -bool page_poisoning_enabled(void) |
|---|
| 27 | | -{ |
|---|
| 28 | | - /* |
|---|
| 29 | | - * Assumes that debug_pagealloc_enabled is set before |
|---|
| 30 | | - * free_all_bootmem. |
|---|
| 31 | | - * Page poisoning is debug page alloc for some arches. If |
|---|
| 32 | | - * either of those options are enabled, enable poisoning. |
|---|
| 33 | | - */ |
|---|
| 34 | | - return (want_page_poisoning || |
|---|
| 35 | | - (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) && |
|---|
| 36 | | - debug_pagealloc_enabled())); |
|---|
| 37 | | -} |
|---|
| 38 | | -EXPORT_SYMBOL_GPL(page_poisoning_enabled); |
|---|
| 39 | 21 | |
|---|
| 40 | 22 | static void poison_page(struct page *page) |
|---|
| 41 | 23 | { |
|---|
| .. | .. |
|---|
| 43 | 25 | |
|---|
| 44 | 26 | /* KASAN still think the page is in-use, so skip it. */ |
|---|
| 45 | 27 | kasan_disable_current(); |
|---|
| 46 | | - memset(addr, PAGE_POISON, PAGE_SIZE); |
|---|
| 28 | + memset(kasan_reset_tag(addr), PAGE_POISON, PAGE_SIZE); |
|---|
| 47 | 29 | kasan_enable_current(); |
|---|
| 48 | 30 | kunmap_atomic(addr); |
|---|
| 49 | 31 | } |
|---|
| 50 | 32 | |
|---|
| 51 | | -static void poison_pages(struct page *page, int n) |
|---|
| 33 | +void __kernel_poison_pages(struct page *page, int n) |
|---|
| 52 | 34 | { |
|---|
| 53 | 35 | int i; |
|---|
| 54 | 36 | |
|---|
| .. | .. |
|---|
| 68 | 50 | static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 10); |
|---|
| 69 | 51 | unsigned char *start; |
|---|
| 70 | 52 | unsigned char *end; |
|---|
| 71 | | - |
|---|
| 72 | | - if (IS_ENABLED(CONFIG_PAGE_POISONING_NO_SANITY)) |
|---|
| 73 | | - return; |
|---|
| 74 | 53 | |
|---|
| 75 | 54 | start = memchr_inv(mem, PAGE_POISON, bytes); |
|---|
| 76 | 55 | if (!start) |
|---|
| .. | .. |
|---|
| 98 | 77 | void *addr; |
|---|
| 99 | 78 | |
|---|
| 100 | 79 | addr = kmap_atomic(page); |
|---|
| 80 | + kasan_disable_current(); |
|---|
| 101 | 81 | /* |
|---|
| 102 | 82 | * Page poisoning when enabled poisons each and every page |
|---|
| 103 | 83 | * that is freed to buddy. Thus no extra check is done to |
|---|
| 104 | | - * see if a page was posioned. |
|---|
| 84 | + * see if a page was poisoned. |
|---|
| 105 | 85 | */ |
|---|
| 106 | | - check_poison_mem(addr, PAGE_SIZE); |
|---|
| 86 | + check_poison_mem(kasan_reset_tag(addr), PAGE_SIZE); |
|---|
| 87 | + kasan_enable_current(); |
|---|
| 107 | 88 | kunmap_atomic(addr); |
|---|
| 108 | 89 | } |
|---|
| 109 | 90 | |
|---|
| 110 | | -static void unpoison_pages(struct page *page, int n) |
|---|
| 91 | +void __kernel_unpoison_pages(struct page *page, int n) |
|---|
| 111 | 92 | { |
|---|
| 112 | 93 | int i; |
|---|
| 113 | 94 | |
|---|
| 114 | 95 | for (i = 0; i < n; i++) |
|---|
| 115 | 96 | unpoison_page(page + i); |
|---|
| 116 | | -} |
|---|
| 117 | | - |
|---|
| 118 | | -void kernel_poison_pages(struct page *page, int numpages, int enable) |
|---|
| 119 | | -{ |
|---|
| 120 | | - if (!page_poisoning_enabled()) |
|---|
| 121 | | - return; |
|---|
| 122 | | - |
|---|
| 123 | | - if (enable) |
|---|
| 124 | | - unpoison_pages(page, numpages); |
|---|
| 125 | | - else |
|---|
| 126 | | - poison_pages(page, numpages); |
|---|
| 127 | 97 | } |
|---|
| 128 | 98 | |
|---|
| 129 | 99 | #ifndef CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC |
|---|