This commit is contained in:
Alex Kotov 2022-01-11 15:32:47 +05:00
parent a53b34e31e
commit 9c34fcf975
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
1 changed files with 4 additions and 3 deletions

View File

@ -83,7 +83,8 @@ void kernel_info_init_from_multiboot2(
for (
const struct KernAux_Multiboot2_Tag_MemoryMap_EntryBase *entry =
(struct KernAux_Multiboot2_Tag_MemoryMap_EntryBase*)tag->data;
(struct KernAux_Multiboot2_Tag_MemoryMap_EntryBase*)
KERNAUX_MULTIBOOT2_DATA(tag);
(unsigned char*)entry < (unsigned char*)tag + tag->base.size;
entry =
(struct KernAux_Multiboot2_Tag_MemoryMap_EntryBase*)
@ -125,7 +126,7 @@ void kernel_info_init_from_multiboot2(
panic("Too many modules in Multiboot 2 info.");
}
unsigned int slen = strlen(tag->cmdline);
unsigned int slen = strlen((char*)KERNAUX_MULTIBOOT2_DATA(tag));
if (slen > KERNEL_INFO_CMDLINE_SLEN_MAX) {
panic("Multiboot 2 module cmd line is too long.");
@ -134,7 +135,7 @@ void kernel_info_init_from_multiboot2(
struct Kernel_Info_Module *const module =
&kinfo->modules[kinfo->modules_count];
strcpy(module->cmdline, tag->cmdline);
strcpy(module->cmdline, (char*)KERNAUX_MULTIBOOT2_DATA(tag));
module->base = tag->mod_start;
module->limit = tag->mod_end;