kern/pmm: Fix potential memory corruption issue

mintsuki · mintsuki · commit c59f7c5afb59 · 2024-04-17T19:12:10.000+02:00
diff --git a/kernel/modules/limine/limine.v b/kernel/modules/limine/limine.v
@@ -172,6 +172,7 @@ pub mut:
 pub const (
 	limine_memmap_usable = 0
 	limine_memmap_bootloader_reclaimable = 5
+	limine_memmap_kernel_and_modules = 6
 )
 
 pub struct LimineMemmapEntry {
diff --git a/kernel/modules/memory/physical.v b/kernel/modules/memory/physical.v
@@ -38,7 +38,8 @@ pub fn pmm_init() {
 					 i, entries[i].base, entries[i].length, entries[i].@type)
 
 			if entries[i].@type != u32(limine.limine_memmap_usable)
-				&& entries[i].@type != u32(limine.limine_memmap_bootloader_reclaimable) {
+				&& entries[i].@type != u32(limine.limine_memmap_bootloader_reclaimable)
+				&& entries[i].@type != u32(limine.limine_memmap_kernel_and_modules) {
 				continue
 			}
 			top := entries[i].base + entries[i].length

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ pub mut:`
`172`	`172`	`pub const (`
`173`	`173`	`limine_memmap_usable = 0`
`174`	`174`	`limine_memmap_bootloader_reclaimable = 5`
	`175`	`+ limine_memmap_kernel_and_modules = 6`
`175`	`176`	`)`
`176`	`177`
`177`	`178`	`pub struct LimineMemmapEntry {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ pub fn pmm_init() {`
`38`	`38`	`i, entries[i].base, entries[i].length, entries[i].@type)`
`39`	`39`
`40`	`40`	`if entries[i].@type != u32(limine.limine_memmap_usable)`
`41`		`- && entries[i].@type != u32(limine.limine_memmap_bootloader_reclaimable) {`
	`41`	`+ && entries[i].@type != u32(limine.limine_memmap_bootloader_reclaimable)`
	`42`	`+ && entries[i].@type != u32(limine.limine_memmap_kernel_and_modules) {`
`42`	`43`	`continue`
`43`	`44`	`}`
`44`	`45`	`top := entries[i].base + entries[i].length`