bump linked_list_allocator (0.9 -> 0.10(.5))

adamperkowski · adamperkowski · commit e7bc6017205a · 2024-09-04T19:46:11.000+02:00
https://rustsec.org/advisories/RUSTSEC-2022-0063.html
diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -14,7 +14,7 @@ x86_64 = "0.14"
 uart_16550 = "0.3"
 pic8259 = "0.11"
 pc-keyboard = "0.7"
-linked_list_allocator = "0.9"
+linked_list_allocator = "0.10"
 
 [dependencies.bootloader]
 version = "0.9"
diff --git a/kernel/src/allocator.rs b/kernel/src/allocator.rs
@@ -12,7 +12,7 @@ pub mod bump;
 pub mod fixed_size_block;
 pub mod linked_list;
 
-pub const HEAP_START: usize = 0x_4444_4444_0000;
+pub const HEAP_START: *mut u8 = 0x_4444_4444_0000 as *mut u8;
 pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB
 
 #[global_allocator]
diff --git a/kernel/src/allocator/fixed_size_block.rs b/kernel/src/allocator/fixed_size_block.rs
@@ -32,7 +32,7 @@ impl FixedSizeBlockAllocator {
         }
     }
 
-    pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {
+    pub unsafe fn init(&mut self, heap_start: *mut u8, heap_size: usize) {
         self.fallback_allocator.init(heap_start, heap_size);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl FixedSizeBlockAllocator {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- pub unsafe fn init(&mut self, heap_start: usize, heap_size: usize) {`
	`35`	`+ pub unsafe fn init(&mut self, heap_start: *mut u8, heap_size: usize) {`
`36`	`36`	`self.fallback_allocator.init(heap_start, heap_size);`
`37`	`37`	`}`
`38`	`38`