Skip to content

kernel: fix dangling multiboot cmdline and libc env pointers #2371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uadhran wants to merge 2 commits into
base: main
Choose a base branch
from
Open

kernel: fix dangling multiboot cmdline and libc env pointers #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8062a79
kernel: fix dangling pointers for multiboot cmdline and libc env
uadhran Jul 9, 2026
3cef0ad
kernel: shorten multiboot cmdline lifetime comment
uadhran Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/kernel/multiboot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ void kernel::multiboot(uint32_t boot_addr)
if (info->flags & MULTIBOOT_INFO_CMDLINE) {
const auto* cmdline = (const char*) (uintptr_t) info->cmdline;
INFO2("* Booted with parameters @ {}: {}", (const void*)(uintptr_t)info->cmdline, cmdline);
kernel::state().cmdline = std::pmr::string(cmdline).data();
// Bootloader memory (_multiboot_free_begin); no temp .data()/strdup.
kernel::state().cmdline = cmdline;
}

if (info->flags & MULTIBOOT_INFO_MEM_MAP) {
Expand Down
11 changes: 7 additions & 4 deletions src/platform/x86_pc/init_libc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,13 @@ namespace x86
argv[1] = 0x0;
int argc = 1;

// Env vars
argv[2] = std::pmr::string("LC_CTYPE=C").data();
argv[3] = std::pmr::string("LC_ALL=C").data();
argv[4] = std::pmr::string("USER=root").data();
// Env vars (static storage — not .data() of a temporary pmr::string)
static char env_lc_ctype[] = "LC_CTYPE=C";
static char env_lc_all[] = "LC_ALL=C";
static char env_user[] = "USER=root";
argv[2] = env_lc_ctype;
argv[3] = env_lc_all;
argv[4] = env_user;
argv[5] = 0x0;

// auxiliary vector
Expand Down