kasan: fix memory hotplug during boot

davidhildenbrand · torvalds · commit 3f1959721558 · 2018-05-25T18:12:11.000-07:00
Using module_init() is wrong. E.g. ACPI adds and onlines memory before our memory notifier gets registered. This makes sure that ACPI memory detected during boot up will not result in a kernel crash. Easily reproducible with QEMU, just specify a DIMM when starting up. Link: http://lkml.kernel.org/r/20180522100756.18478-3-david@redhat.com Fixes: 786a895 ("kasan: disable memory hotplug") Signed-off-by: David Hildenbrand <david@redhat.com> Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
@@ -898,5 +898,5 @@ static int __init kasan_memhotplug_init(void)
 	return 0;
 }
 
-module_init(kasan_memhotplug_init);
+core_initcall(kasan_memhotplug_init);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -898,5 +898,5 @@ static int __init kasan_memhotplug_init(void)`
`898`	`898`	`return 0;`
`899`	`899`	`}`
`900`	`900`
`901`		`-module_init(kasan_memhotplug_init);`
	`901`	`+core_initcall(kasan_memhotplug_init);`
`902`	`902`	`#endif`