From fc6d0000c52a8548967957118fb2ff018473572a Mon Sep 17 00:00:00 2001
From: Matheus <matheusuky@gmail.com>
Date: Tue, 16 Aug 2022 22:06:18 -0300
Subject: [PATCH] added auxv to elf stack setup

the needed ones for rtdl; AT_NULL, AT_PHDR, AT_ENTRY, AT_PHNUM, AT_PHENT
---
 initrd/sbin/init         | Bin 1280 -> 4224 bytes
 src/include/kernel/elf.h |   6 +++
 src/sys/sched/elf.c      |  81 +++++++++++++++++++++++++++++----------
 3 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/initrd/sbin/init b/initrd/sbin/init
index c76ad65efcd6b6c8eefaa45014683ddbb31a8b6c..097089d59a49e5413aceabb7e23a9bf71e12fed3 100755
GIT binary patch
literal 4224
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
L!u*~XuHyeUWM=6!

literal 1280
zcmb_c&ubGw6n?w*m&G4z?ZHx!6%pDVmPA3MibTTNIfw@_Ac8L2bYlzMRCgy(#b6*P
zT|yzp`UiONqDN0ws2aR^5qj)J2s9T@mJ*Eb&CbL%5KnzD^S$@I@4cO!nce61%^SL=
zfifMg0Y#<;25}jh$PUFoa|SM>CIcfdEVP4vQ{;&{g&VT9!fsa9<XH5BMdiKs6th}s
zk43+Z57zH*iA1$E6_r~oD($c+w_Rx1`v99WxU}Y{PN!3|Th))LHG7|}<A@r~w@7ZL
zDg7F~hTW#7yXR_ln{BZ5@z3!y>>Z|kV>O_PGU}>!TSLheyY=k5SjHC^5cqYgP<I~O
zYd%KN?r%4En4dLa6tU!cMIK@RFit(uw5PX0TQ#)FBf}$geCN~1(J--gf&|x(887wh
z(V;sikh!af6PSOI%<B~)n9F8o&8fLtxoI<f!Ae^x()`D0n+M=$r&luChd+t@7@l55
zo|jl7a%XTD$eZ%~F%(95gD!z#s`C~6d7P=wE7?c93vx4k^yxl4xFHYRWh)Q)fTt`s
z^x;vkROH||^I_<O+zmMR?otsPZ^7j*LU94W3ZMAgok!$BjEl<S-YN$xSP^Q=TXYJ6
z>w943SA04?T*pD!BsQVFACk=~avu<dy^*NkpUp$^EDoyIrGPFsxroBl{feVlt9-&~
z9Lf5OtVa}fH-_#^cQ0udF(7I0{ZilSSW+ytM9KC7)!LKNcT%t|N!lO!g{bGBlKf%G
h%diV;vgxHR6Fcg;iavo(;@6~T_#o@)8%tVm{U3(?rBMI?

diff --git a/src/include/kernel/elf.h b/src/include/kernel/elf.h
index 6ef95cb4..20495af5 100644
--- a/src/include/kernel/elf.h
+++ b/src/include/kernel/elf.h
@@ -28,6 +28,12 @@
 
 #define STACK_TOP 0x800000000000
 
+#define AT_NULL 0
+#define AT_PHDR 3
+#define AT_PHENT 4
+#define AT_PHNUM 5
+#define AT_ENTRY 9
+
 typedef struct{
 	uint32_t magic;
 	uint8_t bits;
diff --git a/src/sys/sched/elf.c b/src/sys/sched/elf.c
index d3935f53..739efcb0 100644
--- a/src/sys/sched/elf.c
+++ b/src/sys/sched/elf.c
@@ -11,8 +11,8 @@ typedef struct{
 } auxv64_t;
 
 typedef struct {
-	
-	
+	auxv64_t phdr;
+	auxv64_t null;
 } auxv64_list;
 
 static size_t phflagtommuflag(size_t phflags){
@@ -51,13 +51,13 @@ static bool check_header64(elf_header64* header){
 
 }
 
-static void* stacksetup(char* interp, char** argv, char** env){
+static void* stacksetup(char* interp, char** argv, char** env, elf_header64 header, elf_ph64* phs){
 	size_t argc = 0;
 	size_t envc = 0;
 	size_t initialsize = 0;
 	size_t argdatasize = 0;
 	size_t envdatasize = 0;
-	size_t auxvsize    = 8;
+	size_t auxvsize    = 5*8; // FIXME better way of keeping track of this
 
 	while(argv[argc]){
 		argdatasize += strlen(argv[argc]) + 1;
@@ -81,35 +81,61 @@ static void* stacksetup(char* interp, char** argv, char** env){
 
 	initialsize += argc*sizeof(char*); //args
 	initialsize += envc*sizeof(char*); //envs
-	initialsize += 2*sizeof(char**); //argv envp
 	initialsize += sizeof(size_t);   //argc	
 	
 	// allocate memory for the initial section of the stack
 	
-
-	if(!vmm_allocnowat(STACK_TOP - initialsize, ARCH_MMU_MAP_READ | ARCH_MMU_MAP_WRITE | ARCH_MMU_MAP_NOEXEC | ARCH_MMU_MAP_USER, initialsize)) return NULL;
+	// XXX demand alloc the non initialised stack pages
+	if(!vmm_allocnowat(STACK_TOP - initialsize - PAGE_SIZE*200, ARCH_MMU_MAP_READ | ARCH_MMU_MAP_WRITE | ARCH_MMU_MAP_NOEXEC | ARCH_MMU_MAP_USER, initialsize + PAGE_SIZE*200)) return NULL;
 
 	// get the addresses to copy the data to
 
-	char* argdatastart = STACK_TOP - argdatasize;
+	elf_ph64* phdrdatastart = STACK_TOP - header.ph_count * header.ph_size;
+	char* argdatastart = (void*) phdrdatastart - argdatasize;
 	char* envdatastart = argdatastart - envdatasize;
-	// auxvstart will be aligned
-	void* auxvstart = (void*)(((uintptr_t)envdatastart & (~0xF)) - auxvsize);
+	
+	auxv64_t* auxvstart = (void*)(((uintptr_t)envdatastart & (~0xF)) - auxvsize);
 	// count + 1 because of a null entry
-	char** envstart = auxvstart - (envc + 1)*sizeof(char*);
+	char** envstart = (void*)auxvstart - (envc + 1)*sizeof(char*);
 	char** argstart = (void*)envstart - (argc + 1)*sizeof(char*);
 	if(interp)
 		--argstart;
-	char*** envpptr = (void*)argstart - sizeof(char**);
-	char*** argvptr = (void*)envpptr - sizeof(char**);
-	size_t* argcptr = (void*)argvptr - sizeof(size_t);
 	
-	// XXX auxv
+	size_t* argcptr = (void*)argstart - sizeof(size_t);
+	
+	// auxv
+
+	// AT_PHDR
+	
+	auxvstart->a_type = AT_PHDR;
+	auxvstart->a_val = (uint64_t)phdrdatastart;
+	auxvstart++;
+	
+	memcpy(phdrdatastart, phs, header.ph_count * header.ph_size);
+
+	// AT_PHENT
+
+	auxvstart->a_type = AT_PHENT;
+	auxvstart->a_val = header.ph_size;
+	auxvstart++;
+
+	// AT_PHNUM
+
+	auxvstart->a_type = AT_PHNUM;
+	auxvstart->a_val = header.ph_count;
+
+	// AT_ENTRY
+	
+	auxvstart->a_type = AT_ENTRY;
+	auxvstart->a_val = header.entry;
+	auxvstart++;
+
+	// AT_NULL
+
+	auxvstart->a_type = AT_NULL;
 
 	// copy the data
 
-	*envpptr = envstart;
-	*argvptr = argstart;
 
 	if(interp){
 		strcpy(argdatastart, interp);
@@ -147,7 +173,9 @@ static void* stacksetup(char* interp, char** argv, char** env){
 int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env){
 	
 	elf_header64 header;	
-	elf_ph64 ph;
+	elf_header64 progheader;
+	elf_ph64 ph; 
+
 	int err = 0;
 	int readc = vfs_read(&err, node, &header, sizeof(elf_header64), 0);
 	char* interp = NULL;
@@ -159,8 +187,13 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env){
 	if(readc != sizeof(elf_header64) || (!check_header64(&header)))
 		return EINVAL;
 	
+	progheader = header; // incase an interpreter exists
 	
 	// find out if this needs an interpreter
+	// and also save the executable's program headers
+	// for auxv
+
+	elf_ph64 progphs[header.ph_count];
 
 	for(size_t currentph = 0; currentph < header.ph_count; ++currentph){	
 		readc = vfs_read(&err, node, &ph, header.ph_size, header.ph_pos + currentph*header.ph_size);
@@ -169,10 +202,14 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env){
 		if(readc != header.ph_size)
 			return EINVAL;
 		
+		memcpy(progphs+currentph, &ph, sizeof(elf_ph64));
+
 		if(ph.type == PH_TYPE_INTERPRETER){
 
 			// load the name and elf header of the interpreter
 
+			progheader = header;
+
 			char* interp = alloc(ph.fsize + 1);
 			if(!interp)
 				return ENOMEM;
@@ -204,8 +241,6 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env){
 				goto _fail;
 			}
 
-			break;
-
 		}
 		
 	}
@@ -265,7 +300,11 @@ int elf_load(thread_t* thread, vnode_t* node, char** argv, char** env){
 
 	}
 	
-	void* stack = stacksetup(interp, argv, env);
+	
+
+	
+
+	void* stack = stacksetup(interp, argv, env, progheader, progphs);
 	
 	arch_regs_setupuser(thread->regs, (void*)header.entry, stack, true);