| From 3f1959721558a976aaf9c2024d5bc884e6411bf7 Mon Sep 17 00:00:00 2001 |
| From: David Hildenbrand <david@redhat.com> |
| Date: Fri, 25 May 2018 14:48:11 -0700 |
| Subject: kasan: fix memory hotplug during boot |
| |
| From: David Hildenbrand <david@redhat.com> |
| |
| commit 3f1959721558a976aaf9c2024d5bc884e6411bf7 upstream. |
| |
| 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: 786a8959912e ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| mm/kasan/kasan.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/mm/kasan/kasan.c |
| +++ b/mm/kasan/kasan.c |
| @@ -800,5 +800,5 @@ static int __init kasan_memhotplug_init( |
| return 0; |
| } |
| |
| -module_init(kasan_memhotplug_init); |
| +core_initcall(kasan_memhotplug_init); |
| #endif |
