Merge pull request #1461 from hermit-os/null-scheduler

fix(x86_64): check for null pointer in `core_scheduler`
hermit-os · Nov 19, 2024 · 5f787a2 · 5f787a2
2 parents d6177f0 + 8ea6295
commit 5f787a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/arch/aarch64/kernel/core_local.rs b/src/arch/aarch64/kernel/core_local.rs
@@ -93,7 +93,7 @@ pub(crate) fn core_id() -> CoreId {
 
 #[inline]
 pub(crate) fn core_scheduler() -> &'static mut PerCoreScheduler {
-	unsafe { &mut *CoreLocal::get().scheduler.get() }
+	unsafe { CoreLocal::get().scheduler.get().as_mut().unwrap() }
 }
 
 pub(crate) fn async_tasks() -> RefMut<'static, Vec<AsyncTask>> {

diff --git a/src/arch/riscv64/kernel/core_local.rs b/src/arch/riscv64/kernel/core_local.rs
@@ -76,7 +76,7 @@ pub fn core_id() -> CoreId {
 
 #[inline]
 pub fn core_scheduler() -> &'static mut PerCoreScheduler {
-	unsafe { &mut *(CoreLocal::get().scheduler.get()) }
+	unsafe { CoreLocal::get().scheduler.get().as_mut().unwrap() }
 }
 
 #[inline]

diff --git a/src/arch/x86_64/kernel/core_local.rs b/src/arch/x86_64/kernel/core_local.rs
@@ -107,7 +107,7 @@ pub(crate) fn core_id() -> CoreId {
 }
 
 pub(crate) fn core_scheduler() -> &'static mut PerCoreScheduler {
-	unsafe { &mut *CoreLocal::get().scheduler.get() }
+	unsafe { CoreLocal::get().scheduler.get().as_mut().unwrap() }
 }
 
 pub(crate) fn async_tasks() -> RefMut<'static, Vec<AsyncTask>> {