kasan: rename (un)poison_shadow to (un)poison_range

This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. The new mode won't be using shadow memory. Rename external annotation kasan_unpoison_shadow() to kasan_unpoison_range(), and introduce internal functions (un)poison_range() (without kasan_ prefix).

Andrey Konovalov committed 5 years ago

Commit cebd0eb1 parent d5750ed7 files · +47 −42Browse files

Unified · Split

7 files

include/linux/kasan.h +3 −3
kernel/fork.c +2 −2
mm/kasan/common.c +27 −22
mm/kasan/generic.c +11 −12
mm/kasan/kasan.h +2 −1
mm/kasan/tags.c +1 −1
mm/slab_common.c +1 −1

include/linux/kasan.h+3−3

@@ -72,7 +72,7 @@ extern void kasan_enable_current(void); · 71 unmodified lines
72	/* Disable reporting bugs for current task */	72	/* Disable reporting bugs for current task */
73	extern void kasan_disable_current(void);	73	extern void kasan_disable_current(void);
74		74
75	void kasan_unpoison_shadow(const void *address, size_t size);	75	void kasan_unpoison_range(const void *address, size_t size);
76		76
77	void kasan_unpoison_task_stack(struct task_struct *task);	77	void kasan_unpoison_task_stack(struct task_struct *task);
78		78
@@ -109,7 +109,7 @@ struct kasan_cache { · 30 unmodified lines
109	size_t __ksize(const void *);	109	size_t __ksize(const void *);
110	static inline void kasan_unpoison_slab(const void *ptr)	110	static inline void kasan_unpoison_slab(const void *ptr)
111	{	111	{
112	kasan_unpoison_shadow(ptr, __ksize(ptr));	112	kasan_unpoison_range(ptr, __ksize(ptr));
113	}	113	}
114	size_t kasan_metadata_size(struct kmem_cache *cache);	114	size_t kasan_metadata_size(struct kmem_cache *cache);
115		115
@@ -118,7 +118,7 @@ void kasan_restore_multi_shot(bool enabled); · 2 unmodified lines
118		118
119	#else /* CONFIG_KASAN */	119	#else /* CONFIG_KASAN */
120		120
121	static inline void kasan_unpoison_shadow(const void *address, size_t size) {}	121	static inline void kasan_unpoison_range(const void *address, size_t size) {}
122		122
123	static inline void kasan_unpoison_task_stack(struct task_struct *task) {}	123	static inline void kasan_unpoison_task_stack(struct task_struct *task) {}
124		124

kernel/fork.c+2−2

@@ -225,8 +225,8 @@ static unsigned long alloc_thread_stack_node(struct task_struct tsk, int node) · 224 unmodified lines
225	if (!s)	225	if (!s)
226	continue;	226	continue;
227		227
228	/* Clear the KASAN shadow of the stack. */	228	/* Mark stack accessible for KASAN. */
229	kasan_unpoison_shadow(s->addr, THREAD_SIZE);	229	kasan_unpoison_range(s->addr, THREAD_SIZE);
230		230
231	/* Clear stale pointers from reused stack. */	231	/* Clear stale pointers from reused stack. */
232	memset(s->addr, 0, THREAD_SIZE);	232	memset(s->addr, 0, THREAD_SIZE);

mm/kasan/common.c+27−22

  * Poisons the shadow memory for 'size' bytes starting from 'addr'.
  * Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE.
  */
-void kasan_poison_shadow(const void *address, size_t size, u8 value)
+void poison_range(const void *address, size_t size, u8 value)
 {
 	void *shadow_start, *shadow_end;
 	__memset(shadow_start, value, shadow_end - shadow_start);
 }
-void kasan_unpoison_shadow(const void *address, size_t size)
+void unpoison_range(const void *address, size_t size)
 {
 	u8 tag = get_tag(address);
 	 */
 	address = reset_tag(address);
-	kasan_poison_shadow(address, size, tag);
+	poison_range(address, size, tag);
 	if (size & KASAN_SHADOW_MASK) {
 		u8 *shadow = (u8 *)kasan_mem_to_shadow(address + size);
 	}
 }
+void kasan_unpoison_range(const void *address, size_t size)
+{
+	unpoison_range(address, size);
+}
 static void __kasan_unpoison_stack(struct task_struct *task, const void *sp)
 {
 	void *base = task_stack_page(task);
 	size_t size = sp - base;
-	kasan_unpoison_shadow(base, size);
+	unpoison_range(base, size);
 }
 /* Unpoison the entire stack for a task. */
 	 */
 	void *base = (void *)((unsigned long)watermark & ~(THREAD_SIZE - 1));
-	kasan_unpoison_shadow(base, watermark - base);
+	unpoison_range(base, watermark - base);
 }
 void kasan_alloc_pages(struct page *page, unsigned int order)
 	tag = random_tag();
 	for (i = 0; i < (1 << order); i++)
 		page_kasan_tag_set(page + i, tag);
-	kasan_unpoison_shadow(page_address(page), PAGE_SIZE << order);
+	unpoison_range(page_address(page), PAGE_SIZE << order);
 }
 void kasan_free_pages(struct page *page, unsigned int order)
 {
 	if (likely(!PageHighMem(page)))
-		kasan_poison_shadow(page_address(page),
+		poison_range(page_address(page),
 				PAGE_SIZE << order,
 				KASAN_FREE_PAGE);
 }
 	for (i = 0; i < compound_nr(page); i++)
 		page_kasan_tag_reset(page + i);
-	kasan_poison_shadow(page_address(page), page_size(page),
+	poison_range(page_address(page), page_size(page),
-			KASAN_KMALLOC_REDZONE);
+		     KASAN_KMALLOC_REDZONE);
 }
 void kasan_unpoison_object_data(struct kmem_cache *cache, void *object)
 {
-	kasan_unpoison_shadow(object, cache->object_size);
+	unpoison_range(object, cache->object_size);
 }
 void kasan_poison_object_data(struct kmem_cache *cache, void *object)
 {
-	kasan_poison_shadow(object,
+	poison_range(object,
 			round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE),
 			KASAN_KMALLOC_REDZONE);
 }
 	}
 	rounded_up_size = round_up(cache->object_size, KASAN_SHADOW_SCALE_SIZE);
-	kasan_poison_shadow(object, rounded_up_size, KASAN_KMALLOC_FREE);
+	poison_range(object, rounded_up_size, KASAN_KMALLOC_FREE);
 	if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine) ||
 			unlikely(!(cache->flags & SLAB_KASAN)))
 		tag = assign_tag(cache, object, false, keep_tag);
 	/* Tag is ignored in set_tag without CONFIG_KASAN_SW_TAGS */
-	kasan_unpoison_shadow(set_tag(object, tag), size);
+	unpoison_range(set_tag(object, tag), size);
-	kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+	poison_range((void *)redzone_start, redzone_end - redzone_start,
-		KASAN_KMALLOC_REDZONE);
+		     KASAN_KMALLOC_REDZONE);
 	if (cache->flags & SLAB_KASAN)
 		kasan_set_track(&get_alloc_info(cache, object)->alloc_track, flags);
 				KASAN_SHADOW_SCALE_SIZE);
 	redzone_end = (unsigned long)ptr + page_size(page);
-	kasan_unpoison_shadow(ptr, size);
+	unpoison_range(ptr, size);
-	kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
+	poison_range((void *)redzone_start, redzone_end - redzone_start,
-		KASAN_PAGE_REDZONE);
+		     KASAN_PAGE_REDZONE);
 	return (void *)ptr;
 }
 			kasan_report_invalid_free(ptr, ip);
 			return;
 		}
-		kasan_poison_shadow(ptr, page_size(page), KASAN_FREE_PAGE);
+		poison_range(ptr, page_size(page), KASAN_FREE_PAGE);
 	} else {
 		__kasan_slab_free(page->slab_cache, ptr, ip, false);
 	}
 	 * // vmalloc() allocates memory
 	 * // let a = area->addr
 	 * // we reach kasan_populate_vmalloc
-	 * // and call kasan_unpoison_shadow:
+	 * // and call unpoison_range:
 	 * STORE shadow(a), unpoison_val
 	 * ...
 	 * STORE shadow(a+99), unpoison_val	x = LOAD p
 		return;
 	size = round_up(size, KASAN_SHADOW_SCALE_SIZE);
-	kasan_poison_shadow(start, size, KASAN_VMALLOC_INVALID);
+	poison_range(start, size, KASAN_VMALLOC_INVALID);
 }
 void kasan_unpoison_vmalloc(const void *start, unsigned long size)
 	if (!is_vmalloc_or_module_addr(start))
 		return;
-	kasan_unpoison_shadow(start, size);
+	unpoison_range(start, size);
 }
 static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr,

mm/kasan/generic.c+11−12

@@ -202,11 +202,11 @@ static void register_global(struct kasan_global *global) · 201 unmodified lines
202	{	202	{
203	size_t aligned_size = round_up(global->size, KASAN_SHADOW_SCALE_SIZE);	203	size_t aligned_size = round_up(global->size, KASAN_SHADOW_SCALE_SIZE);
204		204
205	kasan_unpoison_shadow(global->beg, global->size);	205	unpoison_range(global->beg, global->size);
206		206
207	kasan_poison_shadow(global->beg + aligned_size,	207	poison_range(global->beg + aligned_size,
208	global->size_with_redzone - aligned_size,	208	global->size_with_redzone - aligned_size,
209	KASAN_GLOBAL_REDZONE);	209	KASAN_GLOBAL_REDZONE);
210	}	210	}
211		211
212	void __asan_register_globals(struct kasan_global *globals, size_t size)	212	void __asan_register_globals(struct kasan_global *globals, size_t size)
@@ -285,13 +285,12 @@ void __asan_alloca_poison(unsigned long addr, size_t size) · 72 unmodified lines
285		285
286	WARN_ON(!IS_ALIGNED(addr, KASAN_ALLOCA_REDZONE_SIZE));	286	WARN_ON(!IS_ALIGNED(addr, KASAN_ALLOCA_REDZONE_SIZE));
287		287
288	kasan_unpoison_shadow((const void *)(addr + rounded_down_size),	288	unpoison_range((const void *)(addr + rounded_down_size),
289	size - rounded_down_size);	289	size - rounded_down_size);
290	kasan_poison_shadow(left_redzone, KASAN_ALLOCA_REDZONE_SIZE,	290	poison_range(left_redzone, KASAN_ALLOCA_REDZONE_SIZE,
291	KASAN_ALLOCA_LEFT);	291	KASAN_ALLOCA_LEFT);
292	kasan_poison_shadow(right_redzone,	292	poison_range(right_redzone, padding_size + KASAN_ALLOCA_REDZONE_SIZE,
293	padding_size + KASAN_ALLOCA_REDZONE_SIZE,	293	KASAN_ALLOCA_RIGHT);
294	KASAN_ALLOCA_RIGHT);
295	}	294	}
296	EXPORT_SYMBOL(__asan_alloca_poison);	295	EXPORT_SYMBOL(__asan_alloca_poison);
297		296
@@ -301,7 +300,7 @@ void __asan_allocas_unpoison(const void stack_top, const void stack_bottom) · 3 unmodified lines
301	if (unlikely(!stack_top \|\| stack_top > stack_bottom))	300	if (unlikely(!stack_top \|\| stack_top > stack_bottom))
302	return;	301	return;
303		302
304	kasan_unpoison_shadow(stack_top, stack_bottom - stack_top);	303	unpoison_range(stack_top, stack_bottom - stack_top);
305	}	304	}
306	EXPORT_SYMBOL(__asan_allocas_unpoison);	305	EXPORT_SYMBOL(__asan_allocas_unpoison);
307		306

mm/kasan/kasan.h+2−1

@@ -150,7 +150,8 @@ static inline bool addr_has_shadow(const void *addr) · 149 unmodified lines
150	return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));	150	return (addr >= kasan_shadow_to_mem((void *)KASAN_SHADOW_START));
151	}	151	}
152		152
153	void kasan_poison_shadow(const void *address, size_t size, u8 value);	153	void poison_range(const void *address, size_t size, u8 value);
		154	void unpoison_range(const void *address, size_t size);
154		155
155	/**	156	/**
156	* check_memory_region - Check memory region, and report if invalid access.	157	* check_memory_region - Check memory region, and report if invalid access.

mm/kasan/tags.c+1−1

@@ -153,7 +153,7 @@ EXPORT_SYMBOL(__hwasan_storeN_noabort); · 152 unmodified lines
153		153
154	void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size)	154	void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size)
155	{	155	{
156	kasan_poison_shadow((void *)addr, size, tag);	156	poison_range((void *)addr, size, tag);
157	}	157	}
158	EXPORT_SYMBOL(__hwasan_tag_memory);	158	EXPORT_SYMBOL(__hwasan_tag_memory);
159		159

mm/slab_common.c+1−1

@@ -1176,7 +1176,7 @@ size_t ksize(const void *objp) · 1175 unmodified lines
1176	* We assume that ksize callers could use whole allocated area,	1176	* We assume that ksize callers could use whole allocated area,
1177	* so we need to unpoison this area.	1177	* so we need to unpoison this area.
1178	*/	1178	*/
1179	kasan_unpoison_shadow(objp, size);	1179	kasan_unpoison_range(objp, size);
1180	return size;	1180	return size;
1181	}	1181	}
1182	EXPORT_SYMBOL(ksize);	1182	EXPORT_SYMBOL(ksize);

kasan: rename (un)poison_shadow to (un)poison_range

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code