From 0f839b9e8c69bbb9e7b7132969d33dd139f5a691 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 20 Apr 2020 23:47:46 -0400 Subject: [PATCH] kernel/module: Panic if search_module is called during gKernelStartup. The VFS has not been initialized at this point, so we can't use it. Should catch #15865. --- src/system/kernel/module.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/system/kernel/module.cpp b/src/system/kernel/module.cpp index 1c2d2977d3..c4e869fc4f 100644 --- a/src/system/kernel/module.cpp +++ b/src/system/kernel/module.cpp @@ -624,6 +624,11 @@ search_module(const char* name, module_image** _moduleImage) TRACE(("search_module(%s)\n", name)); + if (gKernelStartup) { + panic("search_module called during kernel startup! name: \"%s\"", name); + return NULL; + } + for (i = kNumModulePaths; i-- > 0;) { if (sDisableUserAddOns && i >= kFirstNonSystemModulePath) continue;