Validate bootstrap memory allocation

2024-07-15 03:59:52 +03:00
parent ba154c0387
commit 7a9a5f024f
1 changed files with 20 additions and 17 deletions
@@ -757,23 +757,26 @@ pub unsafe fn usermode_bootstrap(bootstrap: &Bootstrap) {
        let page_count =
            NonZeroUsize::new(bootstrap.page_count).expect("bootstrap contained no pages!");

-        let _base_page = addr_space.acquire_write().mmap(
-            &addr_space,
-            Some(base),
-            page_count,
-            flags,
-            &mut Vec::new(),
-            |page, flags, mapper, flusher| {
-                let shared = false;
-                Ok(Grant::zeroed(
-                    PageSpan::new(page, bootstrap.page_count),
-                    flags,
-                    mapper,
-                    flusher,
-                    shared,
-                )?)
-            },
-        );
+        let _base_page = addr_space
+            .acquire_write()
+            .mmap(
+                &addr_space,
+                Some(base),
+                page_count,
+                flags,
+                &mut Vec::new(),
+                |page, flags, mapper, flusher| {
+                    let shared = false;
+                    Ok(Grant::zeroed(
+                        PageSpan::new(page, bootstrap.page_count),
+                        flags,
+                        mapper,
+                        flusher,
+                        shared,
+                    )?)
+                },
+            )
+            .expect("Failed to allocate bootstrap pages");
    }

    let bootstrap_slice = unsafe { bootstrap_mem(bootstrap) };