Changeset 4a816fe in mainline for kernel/genarch/src/multiboot/multiboot.c

Timestamp:

2009-03-30T19:06:51Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

18251cc

Parents:

c213c77

Message:

more sanity checks

File:

• kernel/genarch/src/multiboot/multiboot.c (modified) (2 diffs)

kernel/genarch/src/multiboot/multiboot.c

@@ -101 +101 @@
         
         if ((flags & MBINFO_FLAGS_MODS) != 0) {
-                init.cnt = mi->mods_count;
+                init.cnt = min(mi->mods_count, CONFIG_INIT_TASKS);
                 mods = (multiboot_mod_t *) MULTIBOOT_PTR(mi->mods_addr);
                 
@@ -131 +131 @@
                 
                 i = 0;
-                while (mmap_length > 0) {
+                while ((mmap_length > 0) && (i < MEMMAP_E820_MAX_RECORDS)) {
                         e820table[i++] = mme->mm_info;