From 81f414f7c06c00e3e0e9577ee06e5e340dd4a420 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sun, 11 Sep 2022 22:23:26 -0300 Subject: [PATCH] elf: fixed silly issues --- src/sys/sched/elf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sys/sched/elf.c b/src/sys/sched/elf.c index 9c373260..13c72961 100644 --- a/src/sys/sched/elf.c +++ b/src/sys/sched/elf.c @@ -10,7 +10,7 @@ static size_t phflagtommuflag(size_t phflags){ size_t mmuflags = 0; - if(phflags & ELF_FLAG_EXECUTABLE == 0) + if((phflags & ELF_FLAG_EXECUTABLE) == 0) mmuflags |= ARCH_MMU_MAP_NOEXEC; if(phflags & ELF_FLAG_WRITABLE) @@ -56,7 +56,7 @@ static int load(vnode_t* node, elf_ph64 ph){ arch_mmu_changeflags(arch_getcls()->context->context, (void*)ph.memaddr, ARCH_MMU_MAP_READ | ARCH_MMU_MAP_WRITE, pagesize); - int err; + int err = 0; size_t readc = vfs_read(&err, node, (void*)ph.memaddr, ph.fsize, ph.offset); @@ -78,7 +78,7 @@ static int load(vnode_t* node, elf_ph64 ph){ // reset proper mmu flags arch_mmu_changeflags(arch_getcls()->context->context, (void*)ph.memaddr, mmuflags, pagesize); - + return 0; } @@ -268,7 +268,6 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env, void** st return ENOMEM; *entry = (void*)header.entry; - return 0; _interpfail: