From efcecd06abb8f7342723a8916917842840e9264f Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Tue, 6 Sep 2016 02:26:55 +0200 Subject: Fix registration of strings from in boot data * i386/i386at/model_dep.c (register_boot_data): Use phystokv on strings when computing their length. --- i386/i386at/model_dep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index 87d6cefa..ab850442 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -291,7 +291,8 @@ register_boot_data(const struct multiboot_raw_info *mbi) if ((mbi->flags & MULTIBOOT_LOADER_CMDLINE) && (mbi->cmdline != 0)) { biosmem_register_boot_data(mbi->cmdline, - mbi->cmdline + strlen((void *)mbi->cmdline) + 1, FALSE); + mbi->cmdline + + strlen((void *)phystokv(mbi->cmdline)) + 1, FALSE); } if (mbi->flags & MULTIBOOT_LOADER_MODULES) { @@ -306,7 +307,8 @@ register_boot_data(const struct multiboot_raw_info *mbi) if (mod->string != 0) { biosmem_register_boot_data(mod->string, - mod->string + strlen((void *)mod->string) + 1, + mod->string + + strlen((void *)phystokv(mod->string)) + 1, FALSE); } } -- cgit v1.2.3