Changeset 6aeb60f in mainline

Timestamp:

2019-05-16T22:26:49Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aeeaf0f

Parents:

a548528

git-author:

Jakub Jermar <jakub@…> (2019-05-16 22:08:53)

git-committer:

Jakub Jermar <jakub@…> (2019-05-16 22:26:49)

Message:

Fix pos to be an offset of entry

pos needs to also include the first 8 bytes of multiboot2_tag_t so that
it represents an offset from the beginning of the tag and points to
entry.

File:

• kernel/genarch/src/multiboot/multiboot2.c (modified) (1 diff)

kernel/genarch/src/multiboot/multiboot2.c

@@ -65 +65 @@
         multiboot2_memmap_entry_t *entry = (multiboot2_memmap_entry_t *)
             ((uintptr_t) memmap + sizeof(*memmap));
-        uint32_t pos = sizeof(*memmap);
+        uint32_t pos = offsetof(multiboot2_tag_t, memmap) + sizeof(*memmap);
 
         while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) {