From a0540658f66feb32c1abe71d9d7589b854e9aaa5 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sun, 30 Jun 2024 23:51:40 -0400 Subject: kernel/amd64: proc: Add stack init func for exec Add stack initialization code for exec functions. This new code initializes values on the stack, including argc, argv, and the auxiliary vector. Signed-off-by: Ian Moffett --- sys/arch/amd64/amd64/proc_machdep.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'sys/arch/amd64') diff --git a/sys/arch/amd64/amd64/proc_machdep.c b/sys/arch/amd64/amd64/proc_machdep.c index ee38f21..2b4368b 100644 --- a/sys/arch/amd64/amd64/proc_machdep.c +++ b/sys/arch/amd64/amd64/proc_machdep.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -38,6 +39,65 @@ #include #include +void +md_td_stackinit(struct proc *td, void *stack_top, struct exec_prog *prog) +{ + uintptr_t *sp = stack_top; + uintptr_t old_sp; + size_t argc, envc, len; + char **argvp = prog->argp; + char **envp = prog->envp; + struct auxval auxval = prog->auxval; + struct trapframe *tfp; + + /* Copy strings */ + old_sp = (uintptr_t)sp; + for (argc = 0; argvp[argc] != NULL; ++argc) { + len = strlen(argvp[argc]) + 1; + sp = (void *)((char *)sp - len); + memcpy((char *)sp, argvp[argc], len); + } + for (envc = 0; envp[envc] != NULL; ++envc) { + len = strlen(envp[envc]) + 1; + sp = (void *)((char *)sp - len); + memcpy((char *)sp, envp[envc], len); + } + + /* Ensure the stack is aligned */ + sp = (void *)ALIGN_DOWN((uintptr_t)sp, 16); + if (((argc + envc + 1) & 1) != 0) + --sp; + + AUXVAL(sp, AT_NULL, 0x0); + AUXVAL(sp, AT_SECURE, 0x0); + AUXVAL(sp, AT_ENTRY, auxval.at_entry); + AUXVAL(sp, AT_PHDR, auxval.at_phdr); + AUXVAL(sp, AT_PHNUM, auxval.at_phnum); + AUXVAL(sp, AT_PAGESIZE, DEFAULT_PAGESIZE); + STACK_PUSH(sp, 0); + + /* Copy envp pointers */ + sp -= envc; + for (int i = 0; i < envc; ++i) { + len = strlen(envp[i]) + 1; + old_sp -= len; + sp[i] = (uintptr_t)old_sp - VM_HIGHER_HALF; + } + + /* Copy argvp pointers */ + STACK_PUSH(sp, 0); + sp -= argc; + for (int i = 0; i < argc; ++i) { + len = strlen(argvp[i]) + 1; + old_sp -= len; + sp[i] = (uintptr_t)old_sp - VM_HIGHER_HALF; + } + + STACK_PUSH(sp, argc); + tfp = &td->tf; + tfp->rsp = (uintptr_t)sp - VM_HIGHER_HALF; +} + void setregs(struct proc *td, struct exec_prog *prog, uintptr_t stack) { -- cgit v1.2.3