From 6157301525f4a2af87251c456fd8aa5f1a40d188 Mon Sep 17 00:00:00 2001
From: Jonathan Klimt <jonathan.klimt@eonerc.rwth-aachen.de>
Date: Tue, 12 Nov 2024 18:21:38 +0100
Subject: [PATCH] Fixed invalid virtual address in kernel_heap_end

---
 src/arch/x86_64/mm/virtualmem.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/arch/x86_64/mm/virtualmem.rs b/src/arch/x86_64/mm/virtualmem.rs
index a191a294ca..8535710f1c 100644
--- a/src/arch/x86_64/mm/virtualmem.rs
+++ b/src/arch/x86_64/mm/virtualmem.rs
@@ -27,7 +27,7 @@ pub fn init() {
 	} else {
 		PageRange::new(
 			mm::kernel_end_address().as_usize(),
-			kernel_heap_end().as_usize(),
+			kernel_heap_end().as_usize() + 1,
 		)
 		.unwrap()
 	};
@@ -89,8 +89,8 @@ pub fn allocate_aligned(size: usize, align: usize) -> Result<VirtAddr, AllocErro
 
 pub fn deallocate(virtual_address: VirtAddr, size: usize) {
 	assert!(
-		virtual_address < kernel_heap_end(),
-		"Virtual address {virtual_address:p} is not < kernel_heap_end()"
+		virtual_address <= kernel_heap_end(),
+		"Virtual address {virtual_address:p} is not <= kernel_heap_end()"
 	);
 	assert!(
 		virtual_address.is_aligned_to(BasePageSize::SIZE),
@@ -121,8 +121,8 @@ pub fn deallocate(virtual_address: VirtAddr, size: usize) {
 		virtual_address
 	);
 	assert!(
-		virtual_address < kernel_heap_end(),
-		"Virtual address {:#X} is not < kernel_heap_end()",
+		virtual_address <= kernel_heap_end(),
+		"Virtual address {:#X} is not <= kernel_heap_end()",
 		virtual_address
 	);
 	assert_eq!(
@@ -161,8 +161,9 @@ pub fn print_information() {
 /// This also marks the start of the virtual memory address space reserved for the task heap.
 #[cfg(not(feature = "common-os"))]
 #[inline]
+/// Returns the last valid address for the heap
 pub const fn kernel_heap_end() -> VirtAddr {
-	VirtAddr::new(0x8000_0000_0000u64)
+	VirtAddr::new(0x7FFF_FFFF_FFFFu64)
 }
 
 #[cfg(feature = "common-os")]