Merge pull request #334 from rust-osdev/fixes

phil-opp · web-flow · commit 78c35e4b470f · 2023-01-26T12:20:18.000+01:00
Fix: treat `kernel_slice_end` as an exclusive bound when checking for overlaps
diff --git a/common/src/legacy_memory_region.rs b/common/src/legacy_memory_region.rs
@@ -160,7 +160,7 @@ where
             let kernel_slice_end = kernel_slice_start + kernel_slice_len;
             if region.kind == MemoryRegionKind::Usable
                 && kernel_slice_start < region.end
-                && kernel_slice_end >= region.start
+                && kernel_slice_end > region.start
             {
                 // region overlaps with kernel -> we might need to split it
 

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ where`
`160`	`160`	`let kernel_slice_end = kernel_slice_start + kernel_slice_len;`
`161`	`161`	`if region.kind == MemoryRegionKind::Usable`
`162`	`162`	`&& kernel_slice_start < region.end`
`163`		`- && kernel_slice_end >= region.start`
	`163`	`+ && kernel_slice_end > region.start`
`164`	`164`	`{`
`165`	`165`	`// region overlaps with kernel -> we might need to split it`
`166`	`166`