mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 08:38:45 +02:00 
			
		
		
		
	kasan: generic: introduce kasan_record_aux_stack_noalloc()
Introduce a variant of kasan_record_aux_stack() that does not do any memory allocation through stackdepot. This will permit using it in contexts that cannot allocate any memory. Link: https://lkml.kernel.org/r/20210913112609.2651084-6-elver@google.com Signed-off-by: Marco Elver <elver@google.com> Tested-by: Shuah Khan <skhan@linuxfoundation.org> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com> Cc: Alexander Potapenko <glider@google.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Taras Madan <tarasmadan@google.com> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vijayanand Jitta <vjitta@codeaurora.org> Cc: Vinayak Menon <vinmenon@codeaurora.org> Cc: Walter Wu <walter-zh.wu@mediatek.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									7594b34774
								
							
						
					
					
						commit
						7cb3007ce2
					
				
					 2 changed files with 14 additions and 2 deletions
				
			
		|  | @ -370,12 +370,14 @@ static inline void kasan_unpoison_task_stack(struct task_struct *task) {} | ||||||
| void kasan_cache_shrink(struct kmem_cache *cache); | void kasan_cache_shrink(struct kmem_cache *cache); | ||||||
| void kasan_cache_shutdown(struct kmem_cache *cache); | void kasan_cache_shutdown(struct kmem_cache *cache); | ||||||
| void kasan_record_aux_stack(void *ptr); | void kasan_record_aux_stack(void *ptr); | ||||||
|  | void kasan_record_aux_stack_noalloc(void *ptr); | ||||||
| 
 | 
 | ||||||
| #else /* CONFIG_KASAN_GENERIC */ | #else /* CONFIG_KASAN_GENERIC */ | ||||||
| 
 | 
 | ||||||
| static inline void kasan_cache_shrink(struct kmem_cache *cache) {} | static inline void kasan_cache_shrink(struct kmem_cache *cache) {} | ||||||
| static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} | static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} | ||||||
| static inline void kasan_record_aux_stack(void *ptr) {} | static inline void kasan_record_aux_stack(void *ptr) {} | ||||||
|  | static inline void kasan_record_aux_stack_noalloc(void *ptr) {} | ||||||
| 
 | 
 | ||||||
| #endif /* CONFIG_KASAN_GENERIC */ | #endif /* CONFIG_KASAN_GENERIC */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -328,7 +328,7 @@ DEFINE_ASAN_SET_SHADOW(f3); | ||||||
| DEFINE_ASAN_SET_SHADOW(f5); | DEFINE_ASAN_SET_SHADOW(f5); | ||||||
| DEFINE_ASAN_SET_SHADOW(f8); | DEFINE_ASAN_SET_SHADOW(f8); | ||||||
| 
 | 
 | ||||||
| void kasan_record_aux_stack(void *addr) | static void __kasan_record_aux_stack(void *addr, bool can_alloc) | ||||||
| { | { | ||||||
| 	struct page *page = kasan_addr_to_page(addr); | 	struct page *page = kasan_addr_to_page(addr); | ||||||
| 	struct kmem_cache *cache; | 	struct kmem_cache *cache; | ||||||
|  | @ -345,7 +345,17 @@ void kasan_record_aux_stack(void *addr) | ||||||
| 		return; | 		return; | ||||||
| 
 | 
 | ||||||
| 	alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; | 	alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; | ||||||
| 	alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT, true); | 	alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT, can_alloc); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | void kasan_record_aux_stack(void *addr) | ||||||
|  | { | ||||||
|  | 	return __kasan_record_aux_stack(addr, true); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | void kasan_record_aux_stack_noalloc(void *addr) | ||||||
|  | { | ||||||
|  | 	return __kasan_record_aux_stack(addr, false); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void kasan_set_free_info(struct kmem_cache *cache, | void kasan_set_free_info(struct kmem_cache *cache, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Marco Elver
						Marco Elver