Changes in kernel/arch/ia32/src/mm/frame.c [7852625:9117ef9b] in mainline

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (2 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -54 +54 @@
         
         for (i = 0; i < e820counter; i++) {
-                uintptr_t base = (uintptr_t) e820table[i].base_address;
-                size_t size = (size_t) e820table[i].size;
+                uint64_t base64 = e820table[i].base_address;
+                uint64_t size64 = e820table[i].size;
+
+#ifdef KARCH_ia32
+                /*
+                 * Restrict the e820 table entries to 32-bits.
+                 */
+                if (base64 >= 0x100000000ULL)
+                        continue;
+                if (base64 + size64 > 0x100000000ULL)
+                        size64 -= base64 + size64 - 0x100000000ULL;
+#endif
+
+                uintptr_t base = (uintptr_t) base64;
+                size_t size = (size_t) size64;
                 
                 if (!frame_adjust_zone_bounds(low, &base, &size))
@@ -79 +92 @@
                         } else {
                                 conf = zone_external_conf_alloc(count);
-                                if (conf != 0)
-                                        zone_create(pfn, count, conf,
-                                            ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||