From df19628b2b6665468e698e290dfd1568720ba042 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Thu, 28 Mar 2024 09:40:50 +0300 Subject: elf-load: Respect PT_GNU_STACK If a bootstrap ELF contains a PT_GNU_STACK phdr, take stack protection from there. Otherwise, default to VM_PROT_ALL. --- kern/bootstrap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kern/bootstrap.c') diff --git a/kern/bootstrap.c b/kern/bootstrap.c index 49358ac6..0470e1b6 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -620,10 +620,10 @@ build_args_and_stack(struct exec_info *boot_exec_info, stack_size = round_page(STACK_SIZE); stack_base = user_stack_low(stack_size); - (void) vm_allocate(current_task()->map, - &stack_base, - stack_size, - FALSE); + (void) vm_map(current_map(), &stack_base, stack_size, + 0, FALSE, IP_NULL, 0, FALSE, + boot_exec_info->stack_prot, VM_PROT_ALL, + VM_INHERIT_DEFAULT); arg_pos = (char *) set_user_regs(stack_base, stack_size, boot_exec_info, arg_len); -- cgit v1.2.3